CA-148495: secure build.
CA-148495: include recent changes.
CA-148495: Merge remote-tracking branch 'creedence/master'.
CA-152823: Hotfix wizard still claims it will reboot hosts
Merge pull request #268 from stephen-turner/CA-152823

CA-152823: Hotfix wizard still claims it will reboot hosts
CA-148495: secure build.

Merge remote-tracking branch 'creedence-sb/master' into sb
Merge pull request #269 from pmw/sb

CA-148495: secure build.
Merge pull request #271 from xenserver/xs64bit

Xs64bit