Use our logger in the cluster master

Change-Id: Idb96381058880d0a6a4441c2e88db26032f78dfd
Inherit from LogData to add locationData

Change-Id: I38e87211d32b524a1105b1757fd33121cf34489a
Merge "Use our logger in the cluster master"
Merge "Inherit from LogData to add locationData"