Update cordova

Last merge was reverted as the Cordova update is not live yet.