Merge pull request #1722 from stevewithington/candidate

partial bundle updates
Adding scope lock around setting of session.siteid
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate
Removing scope lock around setting of session.siteid