Squashed commit from failing-integration-tests - updated maven dependency versions, some formatting, see PR #27