CLC-2522 Update default vals to current recommended config
Merge pull request #1765 from ctweney/clc-2522

CLC-2522 Update default vals to current recommended config