Merge pull request #534 from oalbrigt/fence_aws-fixes
fence_aws: fixes to allow running outside of AWS network