Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf
# Conflicts: # src/test/java/IndexConferenceTest.javamerge-requests/90/head
commit
3f32a61ed2
# Conflicts: # src/test/java/IndexConferenceTest.javamerge-requests/90/head