fighting with code signing, change source version
cleaning up the commit to fit style, deal with #2449
not really on 1.7 yet until we update ecj.jar
Merge remote-tracking branch 'remotes/upstream/master'