Updated to use latest DynamicLocation interfaces
Updated affinity strategy classes
Fixing location resolver issues