Merge remote branch 'origin/master' into prevent-reindexer-session-leak

Conflicts:
	zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java