Merge r270251 from head: Fix return type of callout_init_rm() and add return type to callout_deactivate(). PR: 192520 Submitted by: ngie