ms-be2 new mac addr, new disk layout (720xd), remove dup stanza

Change-Id: I4c5a61feddc947c93af433f4b655e3aa61760de7