Final changes to rapuma.conf mods, moving up to testing branch next