GDS-1150 Accept client conflicts breaks all tracking
Tests
Merge branch 'jmf' of github.com:graniteds/graniteds_java_client into jmf