Port "Fix various DF bugs" to v4.x/ps7.0#796

davidmrdavid merged 2 commits intov4.x/ps7.0Azure/azure-functions-powershell-worker:v4.x/ps7.0from

dajusto/df-ptaches-v4.x/ps7.0Azure/azure-functions-powershell-worker:dajusto/df-ptaches-v4.x/ps7.0Copy head branch name to clipboard