Commit template change for inline comments

Also fix error with inlineCount

Change-Id: I6b89871707082d7085989cc5300fbfd66c77b2f8