Move to new single heat.conf model

This also moves heat's logging to work more like the other OpenStack
services, so /var/log/heat will no longer be present.

Change-Id: I7ce5b8ace81931954849f0f2a3b53ad0572f7c64
Merge "Move to new single heat.conf model"