Issue #4277: merge latest of Cocos2d-js-tests to Cocos2d-js

Merge latest of Cocos2d-js-tests to Cocos2d-js