Issue 7166: 	Fix FBTests on JSD2 branch
- Fix for console/errors/6523/issue6523.js - Source column number is expected, waitForDisplayedElement config for OS-X
Merge remote-tracking branch 'origin/jsd2' into jsd2

Conflicts:
	tests/content/console/errors/6523/issue6523.js