Removed invalid characters causing errors in javadoc generation
Merge branch 'fedora-patch-javadocs' into fedora-branch-2-integration