change to database setup, and add some combined goals for HCP deploying
Merge "change to database setup, and add some combined goals for HCP deploying"