- merge "recovery: Cleanups"
    * Fixing warnings, const-correctness
    * Split the multi-call list out into recovery_cmds.h