Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/nova/precise-essex-proposed

1. precise-essex-proposed
2. Dependent merge proposals