unified properties

Change-Id: I993e1bdfe166a6eb3c5424514e8035f0043f8241
from [ \t]+\n to \n

Change-Id: I049a1303a6a9d74a24b680d6048fc0b3f80965db