Always return NextKeyMarker and NextUploadIdMarker

Fixes EUCA-9097
Merge branch 'team/storage/EUCA-9097' into testing