move job timeout note into General Upgrade Notes. fix merge