mackup 0.5.4

Fix lra/mackup#156

Closes #25236.

Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
Closes #25236.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
sgrep 1.94a

Closes #25240.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>