update ms-be12 entries in dhcp, site, clean up other ms-be entries

Change-Id: I0b736f0d15d6045a8cdafb8bca3ee5196c9f1527