Merge proposals dependent on lp://staging/~openstack-ubuntu-testing/horizon/precise-essex-proposed

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