[OPENENGSB-3659] changed default QueryRequest wildcareAware flag to false
[OPENENGSB-3599] fixed contextId null bug
Merge pull request #867 from mipe/master

[OPENENGSB-3659] changed default QueryRequest wildcareAware flag to fals...
[OPENENGSB-3437] Upgraded relevant parts to pax-wicket 3.0.1

Conflicts:

	ui/admin/src/main/java/org/openengsb/ui/admin/xlink/ToolChooserPage.java
[OPENENGSB-3671] Bug fixed in ui.common bundle
Merge pull request #868 from matthiasseidemann/master

Upgraded relevant parts to pax-wicket 3.0.1
[OPENENGSB-3672] added support for multiple values per key to EDBQueries
Merge pull request #869 from mipe/master

[OPENENGSB-3672] added support for multiple values per key to EDBQueries
Merge remote-tracking branch 'upstream/master' into sync

Conflicts:
	components/edb/src/main/java/org/openengsb/core/edb/jpa/internal/dao/DefaultJPADao.java
	components/edb/src/test/java/org/openengsb/core/edb/jpa/internal/EDBQueryTest.java
	components/ekb/persistence-persist-edb/src/test/java/org/openengsb/core/ekb/persistence/persist/edb/TestEngineeringDatabaseService.java
[OPENENGSB-3446] fixed tests after merge
Merge branch 'sync' into newPersistence

Conflicts:
	components/ekb/persistence-persist-edb/src/test/java/org/openengsb/core/ekb/persistence/persist/edb/TestEngineeringDatabaseService.java