[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of github.com:jenkinsci/ec2-plugin into resolve-instance-types

Conflicts:
	pom.xml