Move a properties file to resource directory, rebase patches and fix javadoc warnings