Add comment on use of useless API - to be removed soon.
Fix dependencies for Maven 2.2.1
Merge remote-tracking branch 'upstream/master'