Move to java 1.7 source level and some cleanup based on Teamscale
findings.