Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/keystone/grizzly-commit-tracking

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