Cfy 1184 ec2 test framework

revert and add libcloud provider explicitly