Simplify regex and fix tests for pamparse#1712

esimkowitz merged 1 commit intomainwavetermdev/waveterm:mainfrom

evan/simplifyregexwavetermdev/waveterm:evan/simplifyregexCopy head branch name to clipboard