Fix for using scala riak client with 2.11 (includes fix for spray and unmarshalling with MultipartContent)