[CA-136072] Move back to last merged tools versions, to overcome build number issue