Bug 583958 - Class diagrams and class hierarchy don't work for java generic classes

Bug 631675 - Java inheritance of instantiated generics not recognized.
Bug 734245 - Q_PROPERTY switches the member access from private to public
Bug 733722 - XML Output invalid: XML_PROGRAMLISTING=YES copies Unicode form feed character (U+000C) to XML files
Merge branch 'master' of github.com:doxygen/doxygen