MODE-2315 Removed non Java 6 compatible idioms & imports.
Merge pull request #1262 from hchiorean/MODE-2315

MODE-2315 Removed non Java 6 compatible idioms & imports.