Improvements to sanity checks

Change-Id: I647be1e5e79c5c9fc8fff7a821bf1017606c2558
Relaxed regex for old_build_vesion

Checked with Chuck - the first token can be a arbitrary branch name

Change-Id: I306637c5bcd41aa77bcc7997c8a5e1be90e41f20