Re-enable AssemblyNameTests.Version test and fix merge conflicts
Re-enable AssemblyNameTests.Version test and fix merge conflicts

ericstj/corefx,krk/corefx,nbarbettini/corefx,ericstj/corefx,MaggieTsang/corefx,twsouthwick/corefx,shimingsg/corefx,nbarbettini/corefx,fgreinacher/corefx,dhoehna/corefx,jlin177/corefx,DnlHarvey/corefx,gkhanna79/corefx,stephenmichaelf/corefx,rubo/corefx,billwert/corefx,elijah6/corefx,mazong1123/corefx,shimingsg/corefx,fgreinacher/corefx,alexperovich/corefx,stone-li/corefx,YoupHulsebos/corefx,DnlHarvey/corefx,billwert/corefx,stephenmichaelf/corefx,MaggieTsang/corefx,MaggieTsang/corefx,cydhaselton/corefx,jlin177/corefx,rubo/corefx,wtgodbe/corefx,YoupHulsebos/corefx,shimingsg/corefx,dotnet-bot/corefx,dhoehna/corefx,BrennanConroy/corefx,alexperovich/corefx,ravimeda/corefx,ptoonen/corefx,parjong/corefx,seanshpark/corefx,shimingsg/corefx,billwert/corefx,krytarowski/corefx,stephenmichaelf/corefx,ViktorHofer/corefx,cydhaselton/corefx,alexperovich/corefx,gkhanna79/corefx,seanshpark/corefx,ViktorHofer/corefx,DnlHarvey/corefx,Jiayili1/corefx,nchikanov/corefx,stone-li/corefx,DnlHarvey/corefx,dotnet-bot/corefx,the-dwyer/corefx,tijoytom/corefx,dotnet-bot/corefx,gkhanna79/corefx,ravimeda/corefx,YoupHulsebos/corefx,seanshpark/corefx,dotnet-bot/corefx,mmitche/corefx,Ermiar/corefx,Ermiar/corefx,the-dwyer/corefx,JosephTremoulet/corefx,dotnet-bot/corefx,dotnet-bot/corefx,alexperovich/corefx,the-dwyer/corefx,zhenlan/corefx,seanshpark/corefx,richlander/corefx,ravimeda/corefx,parjong/corefx,mmitche/corefx,dhoehna/corefx,shimingsg/corefx,elijah6/corefx,jlin177/corefx,tijoytom/corefx,ravimeda/corefx,MaggieTsang/corefx,JosephTremoulet/corefx,wtgodbe/corefx,richlander/corefx,ptoonen/corefx,tijoytom/corefx,wtgodbe/corefx,yizhang82/corefx,krytarowski/corefx,richlander/corefx,billwert/corefx,krytarowski/corefx,Ermiar/corefx,jlin177/corefx,cydhaselton/corefx,krytarowski/corefx,jlin177/corefx,mazong1123/corefx,ViktorHofer/corefx,mmitche/corefx,stone-li/corefx,the-dwyer/corefx,Ermiar/corefx,gkhanna79/corefx,cydhaselton/corefx,stone-li/corefx,stephenmichaelf/corefx,axelheer/corefx,Jiayili1/corefx,wtgodbe/corefx,dhoehna/corefx,jlin177/corefx,JosephTremoulet/corefx,ViktorHofer/corefx,twsouthwick/corefx,ericstj/corefx,ericstj/corefx,alexperovich/corefx,Jiayili1/corefx,stephenmichaelf/corefx,BrennanConroy/corefx,ravimeda/corefx,ravimeda/corefx,krytarowski/corefx,seanshpark/corefx,gkhanna79/corefx,the-dwyer/corefx,tijoytom/corefx,nbarbettini/corefx,dhoehna/corefx,wtgodbe/corefx,Jiayili1/corefx,ericstj/corefx,DnlHarvey/corefx,DnlHarvey/corefx,richlander/corefx,nchikanov/corefx,fgreinacher/corefx,krk/corefx,parjong/corefx,twsouthwick/corefx,yizhang82/corefx,parjong/corefx,yizhang82/corefx,Jiayili1/corefx,mmitche/corefx,mazong1123/corefx,krk/corefx,dhoehna/corefx,elijah6/corefx,billwert/corefx,YoupHulsebos/corefx,mazong1123/corefx,richlander/corefx,twsouthwick/corefx,MaggieTsang/corefx,the-dwyer/corefx,stone-li/corefx,JosephTremoulet/corefx,rubo/corefx,ViktorHofer/corefx,ptoonen/corefx,JosephTremoulet/corefx,krk/corefx,tijoytom/corefx,dhoehna/corefx,ptoonen/corefx,mazong1123/corefx,nchikanov/corefx,zhenlan/corefx,YoupHulsebos/corefx,twsouthwick/corefx,nbarbettini/corefx,MaggieTsang/corefx,rubo/corefx,cydhaselton/corefx,shimingsg/corefx,ptoonen/corefx,seanshpark/corefx,stephenmichaelf/corefx,krytarowski/corefx,BrennanConroy/corefx,wtgodbe/corefx,zhenlan/corefx,alexperovich/corefx,elijah6/corefx,krk/corefx,stone-li/corefx,axelheer/corefx,nchikanov/corefx,twsouthwick/corefx,yizhang82/corefx,cydhaselton/corefx,seanshpark/corefx,alexperovich/corefx,Ermiar/corefx,JosephTremoulet/corefx,mazong1123/corefx,krytarowski/corefx,twsouthwick/corefx,ravimeda/corefx,axelheer/corefx,Jiayili1/corefx,elijah6/corefx,richlander/corefx,parjong/corefx,Ermiar/corefx,elijah6/corefx,YoupHulsebos/corefx,nbarbettini/corefx,billwert/corefx,zhenlan/corefx,gkhanna79/corefx,richlander/corefx,ViktorHofer/corefx,elijah6/corefx,mmitche/corefx,Jiayili1/corefx,nchikanov/corefx,nchikanov/corefx,axelheer/corefx,billwert/corefx,YoupHulsebos/corefx,Ermiar/corefx,MaggieTsang/corefx,axelheer/corefx,ericstj/corefx,jlin177/corefx,yizhang82/corefx,wtgodbe/corefx,gkhanna79/corefx,JosephTremoulet/corefx,mmitche/corefx,stephenmichaelf/corefx,krk/corefx,cydhaselton/corefx,zhenlan/corefx,rubo/corefx,DnlHarvey/corefx,yizhang82/corefx,axelheer/corefx,the-dwyer/corefx,nbarbettini/corefx,parjong/corefx,ptoonen/corefx,ericstj/corefx,yizhang82/corefx,zhenlan/corefx,fgreinacher/corefx,krk/corefx,dotnet-bot/corefx,parjong/corefx,ViktorHofer/corefx,stone-li/corefx,nbarbettini/corefx,shimingsg/corefx,mmitche/corefx,zhenlan/corefx,nchikanov/corefx,mazong1123/corefx,tijoytom/corefx,ptoonen/corefx,tijoytom/corefx