Fix to broken $Id$ tags & $Id$ parsing

Change-Id: Icbda520bcf214b2300635da4546b2356c1fd32fc