Merge "Change security-group clients to return one value and update tests"