Merge "Attempt to fix logging-analytics maven-stage-master job"