Merge "Fix minor documentation issues in RecoveryController"