Increase resilience to CFD template formatting

Allows for spaces in regex used to parse HTML commenting

Change-Id: Ia24d2b15f38d0d29a969a65355b2b9d479c2b416
Merge "Increase resilience to CFD template formatting"