CB-7912: Update to work with whitelist plugins in Cordova 4.x
Merge branch 'unplug-whitelist'
And... a bug fix.
Merge branch 'master' into CB-8125