GUI-897
removed erroneous expired message. fixed logout and test to use id for link
Merge pull request #655 from eucalyptus/GUI-897

GUI-897