Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/horizon/folsom-commit-tracking

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