Updated from global requirements

Change-Id: Ide0e95f47a88015801e445c1cd659f30c51e0c0b
Revert wrapt usage until further notice

Currently its usage is failing on stable/icehouse
which is being fixed, but that branch is also currently
broken due to a tempest failure; so until this situation
is resolved take out the usage of wrapt.

Part of fixes for bug 1394647

Change-Id: Ibfe21944b6e6882f19f7cf4359e8356a64200278