Fixing missing CMake config @

Change-Id: I374ab13cc949d79c42e4e4e776d14114810586dd
Merge topic 'RemoveHashFromDistEggs' into next

6eb8c89 Fixing missing CMake config @