Auto block stuff we know will need to be blocked
Update release plugin version to version that works better with git
More plugin version updates

Conflicts:
	pom.xml
If there is a merge conflict, don't bring up the editor
[CXF-5610] Revert part of the commit so the WS-N tests will pass
Recording .gitmergeinfo Changes