Fixed apt-get errors on Travis CI for recent failures
Bug 1049656 - webservice_jsonp.t is failing in the automated webservice tests due to recent JSONP changes for a security vulnerability
Merge remote-tracking branch 'upstream/master'