core-4936 externalize strings
core-4936 formatting
CORE-4806: Massive refactor of App editor code
Merge branch 'master' into STABLE
Versioned as part of Release Candidate for v1.8.4