Update maven to 3.0.4.

Too many changes since 2.2.1.

Apache Maven 3.0.4 should be backwards compatibility with 2.x. For
compatibility issues, see

https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html
Update apache maven to 3.0.5.

http://maven.apache.org/docs/3.0.5/release-notes.html

Apache Maven 3.0.5 is a maintenance release to fix a security
issue CVE-2013-0253 Apache Maven 3.0.4

http://maven.apache.org/security.html

CVE-2013-0253 Apache Maven 3.0.4

Apache Maven 3.0.4 (with Apache Maven Wagon 2.1) has
introduced a non-secure SSL mode by default. This mode
disables all SSL certificate checking, including: host
name verification , date validity, and certificate chain.
Not validating the certificate introduces the possibility
of a man-in-the-middle attack.

All users are recommended to upgrade to Apache Maven 3.0.5
and Apache Maven Wagon 2.4.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4
Update joyent