am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev

* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users