Remove WAP MAC if a location name has been

Remove WAP MAC if a location name has been assigned

It would make reports look cleaner and make more sense if when a WAP MAC has a location defined, that only the location is shown and suppress the MAC