Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop.

@thatch45 You need to carefully review salt/utils/event.py, as there were substantial merge conflicts there related to changes you made. I think I handled them correctly but may have made a mistake.

Additionally, in salt/modules/state.py, there's a new stanza from 2014.7. As you can see, that stanza of code was not present in any form in develop. However, it has changes going back to before our last merge forward, which means we may not want it in develop at all. I kept it in for now but it is easily removed if it's incorrect for develop.