Merge "Remove CONF reference in test_rest_client"