CRAFTER-233, CRAFTER-177. Improved check style. Fixed unit test and integration test issues
Merge Alvaro's master , minor changes in to the poms to fix sonar build