Merge pull request #856 from claco/v4.2.2rc

Update nova/ceilometer submodules