EDIT

ref #6190 removing svn property place holder in first line of code

fix #6249 prefixig all logappender with instance (bean) name and disabling per instance log files

fix #6268 initializing decriptions of media entities for portal webservices

fix #6261 searching all superclasses for generic type arguments in base controller

cleanup

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts

ref #6248 disabling authorization restriction on /manage/ as temp workaround

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts