Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/storage into redis-cache-bug