WIKI-917: Tests failures using JDK 7 to build (but with compiler source and target = 6)
WIKI-709: Loss of the page's content after validation of the warning message
Merge commit 'a38ebe1811e5a0b43548c45218ac7beb96ed86e2' into HEAD