Integration test unit fixes for canonical units and dimensionless coords under CF 1.6
Integration test unit fixes for canonical units and dimensionless coords under CF 1.6

ioos/compliance-checker,aodn/compliance-checker