Make sure infrastructure providers are setup
Merge pull request #540 from psav/fix_candu

Make sure infrastructure providers are setup