fixed checkstyle errors
Merge branch 'sync' into newPersistence

Conflicts:
	components/ekb/persistence-persist-edb/src/test/java/org/openengsb/core/ekb/persistence/persist/edb/TestEngineeringDatabaseService.java
[OPENENGSB-3675] moved fasterxml.jackson version to root
Merge pull request #870 from mipe/master

[OPENENGSB-3675] fixed fasterxml.jackson version
fixed checkstyle errors
Merge remote-tracking branch 'upstream/master' into sync
Merge branch 'newPersistence' into sync