Removes duplicate options registration in registry clients

Fixes bug #1204359

Change-Id: I5b8bd9e4465d9fe70e9311474bc2b00d9afcf046
Merge "Removes duplicate options registration in registry clients"