streamline nova.server_show() & avoid shadowing server_list()
Merge pull request #8665 from hulu/nova

streamline nova.server_show() & avoid shadowing server_list()