Bug 980447 - Follow-up fixes in clearStoragesForURI to address follow-up comments (r=janv)

--HG--
extra : rebase_source : 31a02fb699def1957c96aeae09052b7106509c84