Bug 898308 - Clean up SessionStore initialization; f=smacleod, r=dao