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