[CB-4432] copyright notice change
[CB-4580] fixed up duplicate definitions of module id
[CB-4752] Updated version and changelog
Merge branch 'dev'