Rebase of PR 112

Rebase https://github.com/CiscoSystems/grizzly-manifests/pull/112