Tweaks to get it talking to the (separate) spatial ingester.
Merge commit '7958649'