Avoid possible leakage of s3 access keys by not including them in log
messages.
This patch includes commit d6e531af48
(change I8dc564bed33d6fc71965f4f573ae9109b410b1d4), which addressed
some more log messages that the original patch had missed.
The two commits are squashed here for ease in backporting (and also
to make sure that *both* are always backported).
Closes-Bug: #2047688
Change-Id: I9193df38d613259b61bb369fa1040fb2c51a21d7
(cherry picked from commit a5ba027922)
(cherry picked from commit 1583aebb69)
45ad5df01f