Store instance resource-id earlier

If creation is interrupted during startup, we will need the ID of the
instance stored in order to delete it later.

bug 1072932

Change-Id: I56b8d285bba43d6e2466705956f85c06f119d65c
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Merge "Store instance resource-id earlier"