Add JID to scheduled jobs names as well
Merge branch '2014.7' of github.com:jacksontj/salt into 2014.7