Deploy of a new Host is failing in an upgraded 3.6 Hosted Engine environment

Issue

• After upgrading a Hosted Engine environment to 3.6, it does not deploy additional host with error during the deploy:

  'Setup validation': Dirty Storage Domain: Wrong Master domain or its version 'SD=HE_SD_ID, pool=HE_Storage_Pool_ID'
  

• Hosted Engine Storage has not been upgraded properly during the upgrade to 3.6. The messages below appears in the agent logs (/var/log/ovirt-hosted-engine-ha/agent.log) or at the status of ovrt-ha-agent service:

  MainThread::INFO::2016-04-07 14:08:47,057::upgrade::977::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(upgrade_35_36) Upgrading to current version
  MainThread::INFO::2016-04-07 14:08:47,072::upgrade::720::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(_stopMonitoringDomain) Stop monitoring domain
  MainThread::INFO::2016-04-07 14:08:47,081::upgrade::151::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(_is_conf_volume_there) Looking for conf volume
  MainThread::ERROR::2016-04-07 14:08:47,168::upgrade::207::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(_is_conf_volume_there) Unable to find HE conf volume
  MainThread::INFO::2016-04-07 14:08:47,168::upgrade::938::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(_move_to_shared_conf) _move_to_shared_conf
  MainThread::INFO::2016-04-07 14:08:47,176::upgrade::298::ovirt_hosted_engine_ha.lib.upgrade.StorageServer::(_connectStoragePool) Connecting storage pool - master 'HE_SD_ID' - dom_dict '{'HE_SD_ID': 'active'}'
  MainThread::ERROR::2016-04-07 14:08:48,570::agent::205::ovirt_hosted_engine_ha.agent.agent.Agent::(_run_agent) Error: 'Unable to connect SP: Wrong Master domain or its version: 'SD=HE_SD_ID, pool=HE_Storage_Pool_ID'' - trying to restart agent