CBLT-82:  fix regular expression matching

Change-Id: I0e3efe789b05613fa1394ba7d043fd23757ec46c