Merge branch 'release' into integration/master

Conflicts:
	docs/release-notes.md
	zanata-war/pom.xml

docs/release-notes.md

@@ -32,7 +32,9 @@ property can safely be reverted or removed before subsequent startups.
 * [1197902](https://bugzilla.redhat.com/show_bug.cgi?id=1197902) - Large translated document push times are inconsistent
 * [1183412](https://bugzilla.redhat.com/show_bug.cgi?id=1183412) - Emails to administrators are sent in the current interface language
 * [1202670](https://bugzilla.redhat.com/show_bug.cgi?id=1202670) - There should be visual clues to indicate active, readonly, and archived versions.
-
+* [875965](https://bugzilla.redhat.com/show_bug.cgi?id=875965) - Enable visible white space in source
+* [1205465](https://bugzilla.redhat.com/show_bug.cgi?id=1205465) - User emails are visible to non admin users in Language page
+* [1205468](https://bugzilla.redhat.com/show_bug.cgi?id=1205468) - Sorting mechanism broken on Languages page
 
 -----------------------