am 54de9063: Merge change 3243 into donut

Merge commit '54de90635e1d0628c396d65e6c948bf4a1529229'

* commit '54de90635e1d0628c396d65e6c948bf4a1529229':
  Fix backup agent unbind