Upstream changes

depends on: https://github.com/CiscoSystems/grizzly-manifests/pull/33