Bug 961718. enableUSBStorage1 is shared in two different places
Merge pull request #15533 from willyaranda/961718

Bug 961718. enableUSBStorage1 is shared in two different places. r=kaze