Merge pull request crowbar#843 from dirkmueller/magnum

magnum: Deployment fixes for HA

Merge pull request crowbar#304 from rhafer/bsc967677

Fix error handling when comparing timeouts (bsc#967677)