Merge branches 'add-exeptions' and 'master' of...

Merge branches 'add-exeptions' and 'master' of https://community.opengroup.org/osdu/platform/system/storage into add-exeptions