Merge "remove ebtables fix env var from wallaby stable job"