`RoutesInspector` deals with routes using regexp as `:controller` option
Merge pull request #10785 from senny/10782_routes_inspector_deals_with_controller_regexp

`RoutesInspector` deals with routes using regexp as `:controller` option
Fix regression in has_secure_password.

If the confirmation was blank, but the password wasn't, it would still save.
Merge pull request #10694 from steveklabnik/hsp_regression

Fix regression in has_secure_password.