Merge master2->master

Did so via:
    git rm -r .
    git checkout --theirs master2 -- .
    git commit -a
2.9.2. [CB-3931] Should ignore "CVS" folders for adding plugins.
[CB-4077] Separate the actions of removing a plugin from a platform and removing the plugin entirely
[CB-4077] Fix tests for cordova-cli