CB-7018 Fix setButtonPlumbedToJs never un-listening
Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java