Resolved conflict. Re-enabled tests, but they still might not work correctly on TeamCity.
Resolved conflict. Re-enabled tests, but they still might not work correctly on TeamCity.

chrisvire/libpalaso,ermshiperete/libpalaso,chrisvire/libpalaso,chrisvire/libpalaso,darcywong00/libpalaso,marksvc/libpalaso,sillsdev/libpalaso,glasseyes/libpalaso,ddaspit/libpalaso,ermshiperete/libpalaso,gmartin7/libpalaso,mccarthyrb/libpalaso,JohnThomson/libpalaso,ddaspit/libpalaso,andrew-polk/libpalaso,mccarthyrb/libpalaso,glasseyes/libpalaso,mccarthyrb/libpalaso,gmartin7/libpalaso,andrew-polk/libpalaso,gtryus/libpalaso,darcywong00/libpalaso,glasseyes/libpalaso,hatton/libpalaso,mccarthyrb/libpalaso,tombogle/libpalaso,gmartin7/libpalaso,andrew-polk/libpalaso,ermshiperete/libpalaso,gmartin7/libpalaso,tombogle/libpalaso,sillsdev/libpalaso,ddaspit/libpalaso,gtryus/libpalaso,hatton/libpalaso,sillsdev/libpalaso,JohnThomson/libpalaso,marksvc/libpalaso,gtryus/libpalaso,hatton/libpalaso,tombogle/libpalaso,marksvc/libpalaso,andrew-polk/libpalaso,darcywong00/libpalaso,JohnThomson/libpalaso,chrisvire/libpalaso,ddaspit/libpalaso,sillsdev/libpalaso,hatton/libpalaso,JohnThomson/libpalaso,ermshiperete/libpalaso,glasseyes/libpalaso,tombogle/libpalaso,gtryus/libpalaso