Fixes so that the task version works
Fixes so that the task version works

whoisj/corefxlab,Vedin/corefxlab,KrzysztofCwalina/corefxlab,VSadov/corefxlab,stephentoub/corefxlab,ahsonkhan/corefxlab,joshfree/corefxlab,joshfree/corefxlab,ericstj/corefxlab,tarekgh/corefxlab,benaadams/corefxlab,Vedin/corefxlab,adamsitnik/corefxlab,stephentoub/corefxlab,stephentoub/corefxlab,VSadov/corefxlab,Vedin/corefxlab,Vedin/corefxlab,ericstj/corefxlab,stephentoub/corefxlab,stephentoub/corefxlab,stephentoub/corefxlab,tarekgh/corefxlab,ahsonkhan/corefxlab,VSadov/corefxlab,ericstj/corefxlab,KrzysztofCwalina/corefxlab,Vedin/corefxlab,benaadams/corefxlab,VSadov/corefxlab,VSadov/corefxlab,dotnet/corefxlab,dotnet/corefxlab,ericstj/corefxlab,ericstj/corefxlab,ericstj/corefxlab,adamsitnik/corefxlab,Vedin/corefxlab,VSadov/corefxlab,whoisj/corefxlab