We need to do this for both the NuGet and K commands <!--- @huboard:{"order":846.5,"milestone_order":807,"custom_state":""} -->
