Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/ceilometer/havana-commit-tracking

1. havana-commit-tracking
2. Dependent merge proposals