Prevent Schema regex's from capturing input

Several of the Regex's we use for validation are needlessly capturing
seqments of the input data, these have been corrected.

Change-Id: I5f3bd37466b69c2335b5a909c9c7bd5bbd795967
Merge "Prevent Schema regex's from capturing input"