Bug 902375 - Actually use the optional parameter added explicitly for this purpose. r=bsmedberg, a=bajaj
Bug 902375 - Strict file origin policy - handle case where the target is the parent directory of the source. r=bz, a=bajaj