Build setup tweak to work around release plugin bug.

http://jira.codehaus.org/browse/MRELEASE-812
Merge pull request #615 from square/jw/build-fixes

Build setup tweak to work around release plugin bug.