Merge proposals dependent on lp://qastaging/~james-page/openstack-charm-testing/scale-oct2014

1. scale-oct2014
2. Dependent merge proposals