Merge "Update REST API url in policy/pap test cases"