Fixes leftovers of #4642 - no more test failures on rundeck functional tests