Fix changing the user shell on FreeBSD
Merge pull request #4358 from herself/hf-test

Fix changing the user shell on FreeBSD
Include traceback in some debug logging. Use `exc_info` instead of formatting the exception "by hand".
changing grain structure to support the grains.present format
find leaks function
Merge pull request #4360 from ranl/develop

tomcat module addition
Merge pull request #4359 from s0undt3ch/develop

Include traceback in some debug logging. Use `exc_info`.
Fix some logging calls which included `exc_info` on the wrong function.
Merge pull request #4363 from s0undt3ch/develop

Fix some logging calls which included `exc_info` on the wrong function.
Change puppet config dirs if Enterprise puppet
Revert "Add workaround for https://github.com/saltstack/salt-api/issues/61"

This reverts commit a42ccf1b0142ca062ce3ffdf5ad9b0a4257e1dbc.
Remove extra paren
Merge pull request #4364 from sfdc-kho/develop

Revert "Add workaround for https://github.com/saltstack/salt-api/issues/61"
Merge pull request #4365 from UtahDave/puppet_dirs

Fixes Puppet Enterprise dirs
Update rvm.py

there is a bug in the code that causes _rvm to return False when rvm is not installed on the root account.
this commit passes runas to is_installed so it queries the correct user
Merge pull request #4366 from aberant/patch-1

Update rvm.py
* fix bug: cmd._run does not care about env argument when runas is passed
* fix bug: unable to set pass env param through command line
* fix bug: if runas set and shell rc files (.bashrc, .profile, etc) contain
  something that make stdout output env gathering fails
* fix bug (FreeBSD specific): su -s key has different meening (not about shell)
Merge pull request #4367 from giantlock/develop

some fixes for cmd module
Ref #4361 : add some unit tests on pip's args
Fix #4361 : requirements option is broken

Add the requirements also when providing local requirement file