Alf changes from master

Re-target https://github.com/adobe/brackets/pull/8599 for **release** branch

Note this still does not have all string changes.