[Kate/David] Nuget restore call change and some grunt shell task adjustments