Merge "Change sf-notifier and sf-reporter env vars structure to dict"