switched to 1.7.5

Add ceilometer support
(and fix merge conflicts relative to grizzly)