Merge branch 'bug-fix/added-server-license-method-for-tests' of https://github.com/arangodb/arangodb-java-driver into bug-fix/added-server-license-method-for-tests

Author: BCaxelbecker

ChangeLog.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+- added smartJoinAttribute and shardingStrategy collection attributes
+
 ## [5.0.4] - 2019-18-01
 
 ### Fixed