Bring webOS-DevRel/cordova-js up to date with apache/cordova-js