Merge pull request #5179 from dhml/devel

Fix issue #5043: ec2_vpc module wait=yes state attribute retrieval