Fix Source & JavascriptHandler.

@Bug W-2033411@

@rev ammcculloch@
Merging origin/goliver/master-pending-js-handler into master