Merge "Fix ZUUL_COMMIT in certain conditions"