This changes are currently in conflict. Since we'll be working on https://github.com/adobe/brackets/pull/3575, we could just discard this here and take care of it all together.