Resolved issue with SQL Cluster validation

Change-Id: I20f03d21c09d090b7edb3360da385e12cad28102
Merge "Resolved issue with SQL Cluster validation" into release-0.2