Fix known branches detection
Fix known branches detection

If there were vs16 packages listed in the series folder, the first
regex didn't parse these correctly, and if any vc packages were there,
the second regex was never executed.  We fix this by merging the two
regexs into one.

OSTC/php-sdk-binary-tools,OSTC/php-sdk-binary-tools,OSTC/php-sdk-binary-tools