Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Fixed two bugs:

  - missing global name(_callable got deleted in the loop) bug in modules/useradd.py
  - no 'mako' attribute from salt.utils.templates.
Fixed two bugs:

  - missing global name(_callable got deleted in the loop) bug in modules/useradd.py
  - no 'mako' attribute from salt.utils.templates.
Merge branch 'develop' of github.com:kjkuan/salt into develop
Merge pull request #3168 from kjkuan/develop

Bug fixes