Merge "Fix spark address in analytics pipeline"