Revert PR 1711; disabling JS tests again
Merge pull request #1767 from edx/will/revert-1711

Revert PR 1711; disabling JS tests again
Fix CHANGELOG conflicts again.