Fix control comments breaking when next to other comments

Change-Id: I330d7537408f51766788afddb8d1eba086b1d121
Reviewed-on: http://gerrit.causes.com/44987
Tested-by: jenkins <jenkins@brigade.com>
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>
Allow control comments to apply to a single line

Change-Id: Ic898684f7df847878145c430920f82c0225b72c3
Reviewed-on: http://gerrit.causes.com/44988
Tested-by: jenkins <jenkins@brigade.com>
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>