This commit fixes #2188, #2189 Changed disk storage to swift storage