Removed invalid characters causing errors in javadoc generation
Merge branch 'fedora-patch-javadocs' into fedora-branch-2-integration
Sync update with branch-2 patches
Merge branch 'fedora-branch-2-integration' into fedora-branch-2-test