Merge heat-cli package w/ heat-common (works better w/ puppet).