Merge remote-tracking branch 'upstream/devel' into HEAD
ec2 inventory plugin: Add a global tag for all EC2 or RDS instances
Merge branch 'ec2_global_tag' into devel