Merge "Some clean up of app install and user management." into jb-mr1-dev