Clean up pass-through variables and standardize defaults#90

Oddly merged 1 commit intomainOddly/elasticstack:mainfrom

fix/collection-cleanupOddly/elasticstack:fix/collection-cleanupCopy head branch name to clipboard