#396 Moved oauth entities out of serviceregistry lib