This reverts commit 7524b3770f.
Liberty uses heat_user_domain and works and this should too. The
bootstrap process itself must have changed or another part of the
config. Either way that needs to be fixed so we can do proper upgrades.
Basically, dont change the heat domain out from under the user).
Change-Id: I32ae3ef90d340a83b09c09860af8f3635c1a07a5
1c177f3827