Fix problem pip with hg + not trust
JBoss7 and Artifactory state/modules
Add downloading of specified snapshot version from artifactory
Added special branch '_' in git_pillar to match saltenv
Add syndic application kind to channel and event stack lane naming code
Revert forwarding to syndic since not yet implemented and need to validate sender against syndic_master
Refactor RAETEvent to use Transport RAETCHannel stack preliminary to combining them
Preliminary support for combined single shared lanestack for interprocess events and channels
Documentation fixes for jboss7 and artifactory states/modules
Merge remote-tracking branch 'upstream/develop' into jboss7
Fix #18131

The url password gathering was not fixed for requests
add neutron module
Renamed special branch from '_' to '__env__'
Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with
Add regression test for #8670

Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
Fixes of pylint violations
Change urllib to urllib2 in artifact downloading
Merge remote-tracking branch 'upstream/develop' into jboss7
Remove 'repo' argument as it isn't used by function
Use sdecode in highstate