Revert "ensure location and owner are correctly disabled, even when updating"

This reverts commit d1ec6ceaf8aaa22f32aa55450384814bf269d755.
Revert "add patch to make location and owner configurable in config mode"

This reverts commit eb49890520bd87dba1b9a7429fad80374c3ddc67.
Add primary mac as place holder for reboot page