Merge "Added Heat Software Config-Deploy API tests"