Merge "Fix mac address generator in stress client" into stable/lithium