Revert to test role master branches for Newton-2 development
Revert to test role master branches for Newton-2 development

The changes in https://review.openstack.org/324748 were implemented
in order to fix all roles for the Newton-1 test deliverable.

This patch reverts the roles tested to the head of the master branch
for continued work towards Newton-2.

Change-Id: I6e5c19ad59742988da85e555203423e5e7e25717

cfarquhar/openstack-ansible,stackforge/os-ansible-deployment,robb-romans/openstack-ansible,yanyao/openstack-ansible,cfarquhar/openstack-ansible,weezer/openstack-ansible,openstack/openstack-ansible,Logan2211/openstack-ansible,Logan2211/openstack-ansible,yanyao/newton,cloudnull/os-ansible-deployment,openstack/openstack-ansible,yanyao/newton,robb-romans/openstack-ansible,BjoernT/os-ansible-deployment,bunchc/openstack-ansible,bunchc/openstack-ansible,mancdaz/openstack-ansible,cloudnull/os-ansible-deployment,mancdaz/openstack-ansible,BjoernT/openstack-ansible,weezer/openstack-ansible,os-cloud/os-ansible-deployment,stackforge/os-ansible-deployment,os-cloud/os-ansible-deployment,BjoernT/os-ansible-deployment,BjoernT/openstack-ansible,BjoernT/os-ansible-deployment,yanyao/openstack-ansible