stop mis-configuration and ensure its set on -dev
Merge pull request #1917 from andymckay/fixup

stop mis-configuration and ensure its set on -dev
hook up login + logout with commonplace via shared token (bug 970598)