HV-924 Restore compatibility with Java 6

Restore compatibility with Java 6 by not using Collections#emptyIterator() and instead using Collections.emptyList().iterator()