Added top-level location object per Simon/Paul spec.
Fixed an NPE in mastership when running optical demo.

Change-Id: I038000d1237b4150db0c722fa96dd9541d83e44e
7 files changed