Fix maligned merge for uri -> config in ip_locations

Issue US336
Merge pull request #90 from claco/test-kitchen-upgrade

Merged automatically by jenkins after successful build test