This fixes the regex to validate the properties property so that value
strings shorter than 3 characters are accepted.
This also removes the heading spaces because these are not stripped but
added to the keys, which likely results in an unexpected result.
Change-Id: I8d703a48060abb61834ecec9c72bb6295eff2b81
(cherry picked from commit 0f500ef7da)
f89f0050b4