Change to rootwrapper - bug #1075120

Change-Id: I2292d1a47772859904bd8f1bb1add30387abb481