Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev

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