missed a couple changes after merge.
Merge pull request #98 from continuuity/feature/service-dependencies-integration-fix

missed a couple changes after merge.
updating test json objects for integration tests.
Merge remote-tracking branch 'origin/develop' into feature/add-provider-automator-type
updating cluster definitions json for integration tests.