Update rootwrap with code from oslo.

Change-Id: I30f1b8773840c098f1e38d09bf13f0863035289e
Merge "Update rootwrap with code from oslo."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp