Merge branch 'V6.0.1rc' into release

# Conflicts:
#	src/main/webapp/WEB-INF/web.xml

[TEAMMATES#8055] Update about.jsp with contributors from V5.112 (TEAM…

…MATES#8091)

[TEAMMATES#7619] Update about.jsp with contributors from V5.108 (TEAM…

…MATES#7622)