Bug 836097 - diff error log, re-enable final push - r=armenzg