Moving aws.cf into main folder so that same template can also create the
test server.
Merge branch 'master' of https://github.com/svpmtrust/autotest