Fallback to conductor if types are not stashed.

If the instance types are not stashed, fallback to
the conductor API to retrieve them.

bug 1164110

Change-Id: I1f0ef48e072f8580980de5bd8d43cf2206cd7d27
Merge "Fallback to conductor if types are not stashed."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp