Merge "Update shell command line to take optional user id." into sc-dev