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