CORE-4591: fixed a problem that was preventing users from editing apps
Merge branch 'master' into STABLE