Simplification and workaround problem for Dropbox storage

This Merge request contains two code simplification and a workaround in 9342612b to solve infinite redirection loop when using dropbox storage.