The old role will be kept and include ensure-go for backwards-compatability. Change-Id: I4e6345563817057a6c47c124b9ec8b0c62b057d6