CORE-4806: Massive refactor of App editor code
CORE-4806: Label edit mode is working again
CORE-4608: Fixed issue with cmd line ordering dialog.
Merge branch 'master' into STABLE
Versioned as part of Release Candidate for v1.8.4