Fix User Plugin tests with non-semver compliant breakage in Sinon
Finally remove Q in favor bluebird everywhere.