Continued work on blueprint finish-uuid-conversion. Change-Id: I64302d0abb2e734422e6b0fee8f12e90f4ce711a