v1.2.4-146: Merge remote-tracking branch 'origin/intellij15' into intellij2016.2

# Conflicts:
#	gradle.properties
#	src/main/java/com/urswolfer/intellij/plugin/gerrit/OpenIdeDependenciesModule.java
#	src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java
#	src/test/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritTestModule.java