Bug 740142 - configuration clean up. r=jlund