Merge "Added test scenarios around nested clusters" into oc-dev