Revert "#1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions"

This reverts commit e3132af0aa56f27c2d91a981f1a4fecb2f92fe97.
Merge branch '3.0.x' of github.com:gallery/gallery3 into 3.0.x