Merge branch 'develop' into elm
Bug 949716 - Bump maven-site-plugin to 3.3 to work with Maven 3.1.1. r=rnewman