o.c.cagateway.feature: Added some packages.
Merge branch 'develop'