Merge "Fix typo in ceilometer and neutron tests"