Merge pull request #32 from xenserver/master

Merge four changesets from master to xs64bit
Merge pull request #36 from stephen-turner/CA-112247-b

[CA-112247] Improved wording on HA wizard
Merge pull request #34 from stephen-turner/CA-95967

Fix PluginTabsAndMenus tests after check-in for [CA-95967]
Merge pull request #40 from xenserver/master

Merge latest changes from master to xs64bit including [CA-99780]
Merge pull request #41 from xenserver/xs64bit

Merge pull request merges from xs64bit to master