Merge "intellij-gen: default to use jdk 1.7"