Backport service-guard fix from next branch.
[jamespage,t=sparkiegeek,r=sparkiegeek] Backport service-guard feature to support landscape cloud-installer