1158138, 1113629 - Allow '.' in logins, permissions
merge 1299
Merge branch '2.6-dev'