Upgraded to the latest upstream version 3.6.0
Renamed patch without changing the content
Deleted unapplicable patches
Addressed review comments: javadoc package needs to be properly obsoleted and old patches porting to Maven 3 API removed
Addressed review comments