This allows us to remove the final TODO. Change-Id: I886045ab4e6bdb8418fd1ccdcd811417ecb4ad4a Implements: bp centralize-config-options-ocata