CA-133523: Revert patch as now -priv is supported again
Merge commit 'e6ab9f7951f55ef1fd24436b0ff46bd8f2e842a8'
Merge commit '9b93ce597b1a4ec10b4d0ccdb6236d12e8efad93'
Merge pull request #1891 from simonjbeaumont/creedence-merge

Merge from creedence into creedence-ring3