JCLOUDS-428: Use Maps with a consistent iteration order