Merge "OMS: limit shell command output via optional args" into qt-dev