Merge branch 'ccm-bugfixes' into 'develop'

...System/diameterModels/constantDiameter/constantDiameter.H

...aceTensionCoefficient/constantSurfaceTensionCoefficient.H

...pectRatioModels/constantAspectRatio/constantAspectRatio.H

...pectRatioModels/constantAspectRatio/constantAspectRatio.H

applications/test/unitConversion/Make/files

applications/test/unitConversion/Make/options

applications/test/unitConversion/Test-unitConversion.C

...tions/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C

...nFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C

src/OpenFOAM/containers/Lists/ListOps/ListOps.H

src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C

src/OpenFOAM/global/unitConversion/unitConversion.H

src/OpenFOAM/meshes/meshTools/mergePoints.C

src/OpenFOAM/meshes/meshTools/mergePoints.H

src/OpenFOAM/primitives/enums/NamedEnum.H

src/OpenFOAM/primitives/enums/NamedEnumI.H

src/conversion/ccm/Make/files

src/conversion/ccm/common/ccmBase.H

src/conversion/ccm/misc/ListOps1.H

src/conversion/ccm/misc/ListOps1Templates.C