Merge remote-tracking branch 'remotes/mirror/sakai-10.x' into sakai-10.x

Conflicts:
	kernel-component/src/main/webapp/WEB-INF/site-components.xml
	kernel-impl/src/main/java/org/sakaiproject/content/impl/AbstractContentResource.java
	kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java
	kernel-impl/src/main/java/org/sakaiproject/content/impl/WrappedContentResource.java
	kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
	kernel-impl/src/main/sql/mysql/sakai_realm.sql