[DO NOT MERGE] Allow env vars to be defined and empty when passed into the container

(otherwise, they will be defaulted to 'None' if left blank)