Merge branch 'cinder-backend-netapp' into dt-test
Merge branch 'cinder-backend-solidfire' into dt-test
Merge branch 'erlang-b-gone' into dt-test
Merge branch 'conf-tempest' into dt-test
Merge branch 'test-service-functions' into dt-test
Merge branch 'exercise-refresh' into dt-test