Merge pull request #4787 from mohangk/devel

Fix: ec2_eip connect method references module var that is not passed in
Fix for connect method parameter order