Merge "make console shell run as GID=shell"