Merge "Remove all CONF values from RestClient"