fix failing maven plugin tests
Merge branch 'fixTests' into 1.6.x
update javadoc
Merge branch 'coffeeUpdate' into 1.6.x