Merge "BUG-1563 added default mac address and mac address for non-OF infrastructure...