Merge branch '
LDEV-5436' into v4.8
# Conflicts:
# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
# lams_learning/web/presenceChat.jsp
# lams_monitoring/web/gate/gateStatus.jsp
# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
# lams_tool_images/web/pages/learning/learning.jsp