Merge branch 'feature-store' into develop

diff --cc kamaki/clients/pithos/__init__.py
index f8b846d,5d6dbe7..6cdca02
--- 1/kamaki/clients/pithos/__init__.py
--- 2/kamaki/clients/pithos/__init__.py
+++ b/kamaki/clients/pithos/__init__.py
@@@ -393,9 -396,9 +396,11 @@@ class PithosClient(PithosRestClient)
              format='json',
              hashmap=True,
              content_type=content_type,
+             if_etag_not_match='*' if if_not_exist else None,
+             etag=etag,
              json=hashmap,
 +            permissions=sharing,
 +            public=public,
              success=201)
  
      # download_* auxiliary methods