Added conf inheritance
Change ipappliance test to check scheme and netloc
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