Merge proposals dependent on lp://staging/~openstack-ubuntu-testing/horizon/raring-grizzly-proposed

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