Comment 3 for bug 1397938

i'm using changing this to the above where i will add a "enable_discovery" option -- true by default -- which will function as it currently does (using service catalog).

if false, it will look into conf file which should have defaults defined.