Move errors.properies to resources directory
Rebase patches to current master
Fix Javadoc warnings