[ros-diffs] [sginsberg] 38244: - Add missing ACTIVATION_CONTEXT_BASIC_INFORMATION and WRITE_WATCH_FLAG_RESET