Fixed typo did not specify as attribute
fixed conflicts
also caused failures in testing because now we are tracking the remote.main
and some tesets where not setting the stack.main when stack was recreated as the .main is not persisted
but is required when restarting a stack

Merge remote-tracking branch 'salt/master'

Conflicts:
	raet/road/transacting.py