Include base_dir in session namespaces.
Merge branch '2.5.x' into saas