Normalized where RAET keep files are stored. So use consistent path

This merge is behind develop since current develop is broken so I did not include latest develop fetch in this commit.


With this commit the keep caches for Master and Minion are as follows below;

Everything is now in the same place and uses the opts['cachedir'] as the prefix for the path

cachedir/raet/stackname

where the default cachedir is
/var/cache/salt/master 
or
/var/cache/salt/minion



Keep Caches


salt master:

/var/cache/salt/master/raet/
    master/
        local/
          estate.json
          yard.json
        remote/
          estate2.json

    eventstackname/
        local/
            yard.json
        remote/

    masterworkerstackname/
        local/
            yard.json
        remote/

    clientstackname/
        local/
            yard.json
        remote/


salt minion: (where minion id is alpha)

/var/cache/salt/minion/raet/
    alpha/
        local/
            estate.json
            yard.json
        remote/
            estate1.json

    alphajobstackname/
        local/
            yard.json
        remote/