revert acorn workaround
Merge pull request #4766 from adobe/jasonsanjose/restore-tern

revert acorn workaround
Merge remote-tracking branch 'origin/master' into bchin/fix-prefs-clientid-on-windows
use indexOf() rather than a regex search to match substring