Fixed line breaks to unix-style
Merge branch 'master' into feature-more-services
Fixes for MariaDB auto password