Added conf inheritance
SOAP should now not fail due to setup_infrastructure_providers
Fixed the template tester script again :(
Merge pull request #1298 from mfalesni/setup-infra-providers

SOAP should now not fail due to setup_infrastructure_providers
Ensure that VM gets deleted properly on SCVMM
Make Dockerbot able to test utils tests
Merge pull request #1311 from psav/dockerbot_utils

[WIP] - Make Dockerbot able to test utils tests
Change ipappliance test to check scheme and netloc
Merge pull request #1309 from mfalesni/scvmm-delete-fix

Ensure that VM gets deleted properly on SCVMM
Use setup_provider instead of setup_infra_providers
Merge pull request #1308 from jkrocil/fix-ipappliance-test

Change ipappliance test to check scheme and netloc
wait for ssh before configuring
Merge pull request #1313 from seandst/openstack-wait-for-ssh

wait for ssh before configuring
Merge pull request #1312 from jkrocil/fix-tests-setup-providers

Use setup_provider instead of setup_infra_providers
Merge pull request #1290 from psav/conf_insanity

Conf craziness - Inheritance
Merge branch 'master' into ntp_server