Coding style fix in package related source files
Merge pull request #2522 from tweglarski/CSFixAtPackageSources

Coding style fix in package related source files