Merge topic 'RemoveHashFromDistEggs'

6eb8c89 Fixing missing CMake config @
Merge branch 'master' into next

Change-Id: Ibc6de408a5f983ae4253a4ebebfd458f77ab6f77