EUCA-6198: Topology not containing Walrus service key
   -- the issue is non deterministic
   -- not a final fix, but to log the error condition for debugging
remove commented lines
Merge branch 'dev/spark/services' into testing