Fix launched apps using renamed cordova_plugins.js file (ugh)
Merge branch 'upstream' (fix cordova_plugins take 3)