FR #1113 Rather more intelligent thank you link generation

Merge new components with old components.

Change-Id: Ie444228bb46680a0f5da2af257bf8f398075831f
Merge "FR #1113 Rather more intelligent thank you link generation"