Fix composer.json files + CHANGELOGs
Merge pull request #1964 from stloyd/bugfix/composer

Fix composer.json files + CHANGELOGs