Merge remote-tracking branch 'upstream/3.3.x' into 3.3.x
Use JavaSE-1.7 for org.csstudio.logbook.olog.properties.
Merge pull request #720 from MichaelRitzert/3.3.x

3.3.x