Solve Concrete5 issues

There are conflicts in class names when running dokuwiki with Concrete5 auth plugin.
These edits solve the conflicts with Concrete5.