Change-Id: If09e50508c26b8f489a55b9b5453c2ae5744e672 Implements: blueprint rename-bay-to-cluster Partial-Bug: #1622949