Merge branch 'master' into feature-flavor

xwiki-platform-core/pom.xml

...in/resources/ActiveInstalls/ActiveInstallsHistoryData.xml

.../org/xwiki/activeinstalls/test/ui/ActiveInstallsTest.java

.../org/xwiki/administration/test/po/AdministrationPage.java

...ration/test/po/GlobalRightsAdministrationSectionPage.java

...ministration/test/po/ImportAdministrationSectionPage.java

...wiki/administration/test/po/LightBoxRegistrationPage.java

...iki/administration/test/po/ResetPasswordCompletePage.java

...a/org/xwiki/administration/test/po/ResetPasswordPage.java

...ion-test/xwiki-platform-administration-test-tests/pom.xml

.../org/xwiki/administration/test/ui/AdministrationTest.java

.../test/it/org/xwiki/administration/test/ui/ImportTest.java

...t/org/xwiki/administration/test/ui/ResetPasswordTest.java

...ion-ui/src/main/resources/XWiki/ResetPasswordComplete.xml

...ava/org/xwiki/annotation/test/po/AnnotatableViewPage.java

...n/java/org/xwiki/annotation/test/po/AnnotationsLabel.java

...in/java/org/xwiki/annotation/test/po/AnnotationsPane.java

.../java/org/xwiki/annotation/test/po/AnnotationsWindow.java

...ki/appwithinminutes/test/po/ApplicationClassEditPage.java

...xwiki/appwithinminutes/test/po/ApplicationCreatePage.java