Bug 840172 - Rooting fixes for Wrapper and wrap. r=terrence