Automatic merge from submit-queue

Cleanup the commented code for overriding flags with viper.  For now,…

Minor cleanup for the viper configuration logic, removes commented  code into a function of its own.  We can decide wether or not to overwrite flag values at a later time...