[promise] Use `instead` when mocking JSONP
Merge branch 'dev-master' into dev-3.x