fixing modjk.recover_all function
(https://github.com/saltstack/salt/commit/08ddd2ae6dfb8fab2c03160a4c780ca70752f089#commitcomment-4093277)
Merge remote-tracking branch 'upstream/develop' into modjk

Conflicts:
	salt/modules/modjk.py
Merge pull request #7245 from ranl/modjk

fixing modjk.recover_all function