Merge "Revert "[CONSUL] Make consul run as non-root"" into guilin