Merge changes Ibd37ae12,I9a33547c

* changes:
  backup: no-op code cleanup
  [Multi-user] Make backup dirs user-specific