Khaled Mammou authored Aug 22, 2018 and David Flynn committed Aug 29, 2018

This commit updates the hard coded limit and default values, and
updates the master configuration template.