Share checks between create and rebuild

DRYs up the checks between create and rebuild in preparation for additional
checks going in.

Change-Id: I04a8448f7a3a4e1176b40f943ea9c90c06ba8ece
Merge "Share checks between create and rebuild"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp