Bypass mysql connection arguments
Merge branch 'develop' of github.com:saltstack/salt into develop
allows to format any time derivated objects into jinja saltstack/salt#6088
added unittests for strftime filter saltstack/salt#6088
added documentation saltstack/salt#6088
changed dateutil by timelib saltstack/salt#6088
clean up
Add connections args to other methods
added code to master.py to check for users if they do't show up in
pwd.getpwall. This can happen on LDAP-enabled user systems. You can see the
user not show up, but still be visible if you query for them directly.
Merge pull request #6160 from vicglarson/develop

Bypass mysql connection arguments
Merge pull request #6191 from TheRealBill/develop

Fix for issue #6188
Merge pull request #6124 from johnnoone/strftime-formatter

Strftime formatter
Remove timelib from requirements, not a hard dep
Merge pull request #6193 from UtahDave/riak_module

Initial Riak module
line too long