Merge "Update remote-shell protocol to version 11"