Bug 717062 - root pref branch now configurable P2

second pass. all existing test ok, missing new ones..