Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/horizon/precise-grizzly-proposed

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