Fix /etc/hosts file
Don't include heat init scripts or haproxy config when not installed
Fix upgrade path from 0.8.6

Ensure four replication related directives are present in the MySQL
config before restarting.
Move haproxy services into roles/controller/defaults/main.yml to use Jinja2
Check for heat in template
Merge remote-tracking branch 'upstream/disable-heat-when-noenabled' into combine-411-412-413
Merge remote-tracking branch 'upstream/fix-percona-upgrade' into combine-411-412-413
Revert "testenv: use nested KVM rather than QEMU"

This reverts commit b9b80340054786971e82e7f100bfa7141c77c3c2.
Merge pull request #414 from blueboxgroup/combine-411-412-413

Combine #411 #412 #413 and revert nested KVM in testenv.
Remove extra debug print

This is just bugging me. I left an errant print in this checkin.
Fix typo in "plugin"

Was spelled "plutin"
Merge pull request #416 from craigtracey/noisyraid

Remove extra debug print
Merge remote-tracking branch 'upstream/master' into disable-swap