Merge "Adding PolicyType to getConfig Response"