Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  HookExecutor: Add missing licence header

Change-Id: Iaf1596bbc083a46f171dee3c30a2477d9372dee3