Maven release plugin wrestling.

Trying the fix suggested at
<http://stackoverflow.com/questions/15166781/mvn-releaseprepare-not-committing-changes-to-pom-xml>.

(cherry picked from commit 9c37a508882bb136bf85d0e1c016a1466884c5c7)

Conflicts:
	pom.xml