Merge remote-tracking branch 'origin/v4.7' into v4.8
# Conflicts:
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
# lams_tool_assessment/web/pages/learning/results/allquestions.jsp
# lams_tool_assessment/web/pages/learning/results/allquestions5.jsp