[4.0.0] admin and storage folder move not working. Should also be an opt-out option

After installing 4.0, there is an attempt to move files from "admin" to "newadmin" that doesn't work on my server.
I've tracked down the issue to this line (found twice in the admin/controller/common/security.php file): If I change it to this, it works fine but I'm not an expert on all the GLOB options so it may or may not be complete. In any case, it seemed to work for me But while it does copy and move to "newadmin" it did not seem to auto-delete the original "admin" folder so there may be another issue with that.

Also I would really like to see this move be optional. I've never been a huge fan of the storage move option. Not that I disagree with the overall idea of moving downloads/uploads to a directory that sits higher than the cart for security, but that only downloads and uploads should be moved there and NOT logs, modification files, etc, but I digress.