bug fix; follow-up to change-set 76450, a $Id$ was removed accidentially
bug fix; regex adopted to new $Id$ format

Change-Id: Ie468cdcbcd0bed470a158fa4f5edb879d25a889c