Correctly support direct updates of html update sites and other issues pointed out by jglick in https://github.com/jenkinsci/jenkins/pull/692