Some more configuration changes with respect to the "none" value.

@agorrod, would you please do the review on this one?

I tried to separately commit each change, let me know if anything doesn't make sense.