Move defaults into spec files

-Following new pattern of defaulting in spec files
instead of job templates or manifest templates
-To arbitrarily have keys merged in, you must use the
<<: (( merge  || nil)) syntax
[finishes #71161522]