Merge branch 'release/1.2.1'
Revert "boto ec2instances sometimes have ip_address instead of publicIp"

This reverts commit c5ab17c609a2ba835eb8758f62e7a1a18208788f.
Merge branch 'hotfix/revert_problematic_ip_address' into develop