Tempest configurator workarounds
Merge pull request #94 from sshnaidm/make4

Tempest configurator workarounds