Merge "Upstream: p/common.py: catch stderr in exec_cmd."