GTWY-714 Not all objects are using machine specific identifiers.
GTWY-715 Machine specific MAC is hardcoded into Spring configuration file.