Merge pull request #823 from claco/v4.1.5rc

Update nova/swift submodules
added vhost_net to base role
Merge pull request #853 from cloudnull/v4.1.5rc

added vhost_net to base role