Some minor cosmetic root-context.xml changes