enforcing java 1.6
diamonds replaced
replaced auto closeable with try/catch
Merge branch 'feature/java6migration' into develop