Merge commit '54118adb3766fdf73a409102b88d7494bb6889a3' * commit '54118adb3766fdf73a409102b88d7494bb6889a3': Put back LOGP -> printf in the backup helper code
Merge commit '54118adb3766fdf73a409102b88d7494bb6889a3' * commit '54118adb3766fdf73a409102b88d7494bb6889a3': Put back LOGP -> printf in the backup helper code