Merge branch 'crdt-user-api' into user-api

Conflicts:
	src/main/java/com/basho/riak/client/core/converters/CrdtResponseConverter.java
	src/main/java/com/basho/riak/client/core/operations/DtFetchOperation.java
	src/main/java/com/basho/riak/client/core/operations/DtUpdateOperation.java
	src/main/java/com/basho/riak/client/query/crdt/ops/MapOp.java
	src/main/java/com/basho/riak/client/query/crdt/types/CrdtElement.java
	src/test/java/com/basho/riak/client/core/operations/DtUpdateOperationTest.java
	src/test/java/com/basho/riak/client/core/operations/itest/ITestBase.java
	src/test/java/com/basho/riak/client/core/operations/itest/ITestDtUpdateOperation.java