Merge "Add CUSTOM_KITCHEN_ENVS parameter to salt-formula tests"