Merge pull request #1 from eucalyptus/develop

Merged changes from upstream.
Updated link for log out button per change in the code
Merge pull request #647 from aliceh/develop

Updated tests after this change https://github.com/eucalyptus/eucaconsole/blame/develop/eucaconsole/templates/master_layout.pt#L57