fixed PY-13150 Pyramid run configuration fails when specifing '--reload' in additional option
refactoring (following CR-IC-5531)
javac 6 workaround (from IDEA-16723)
Merge remote-tracking branch 'origin/master'