Revert migration from Set to Map as it is serialized in opal-config.xml
Upgrade dependencies