Change XML name of tags to match EC2 documentation
Merge remote-tracking branch 'mine/develop' into develop