ASM-2354:Fixed issues for Boot Device=NONE, and with cloning.