Updated tenant ID resolution to make it more lenient. - 2.0 release.
Rolled version for next dev cycle.