PLAT-5000 - Avoid non-deterministic ordering

Avoids differences in JDK 8
Reviewed-by: Andrew