OZP-798: Switching from iterables to collections

This work is tangential to security, but is being done to fix a bug that
was found in the ServerConfigController while it was being ported
away from spring as part of the security efforts