make sure app name is distinct when app is installed multiple times
Merge branch 'master' into master-8088