Resolve deploy/undeploy hook argument passing mess (OMS-524)