GUI-488
reduced duration of temp tokens to 900 and no longer use new tokens (just continue with current session tokens)
Merge pull request #337 from eucalyptus/GUI-488

GUI-488