Merge "barometer: remove old script from merge job steps"