Merge "Added test scenarios around nested clusters" into oc-dev
am: 8045f6e012

Change-Id: Ida6aacb93e666d830299598031256e4d195ba001