Merge commit 'f3c3b621ee1104f7c848d55a9b633cd55fb70495' into WL-3576

Conflicts:
	src/java/org/sakaiproject/feedback/tool/FeedbackTool.java
	src/webapp/js/feedback.js
Merge commit 'WL-3590' into weblearn-10.x
Merge branch 'WL-3576' into weblearn-10.x