Fixed server list functional rspec tests.
Merge branch 'prabhu-oc-10816-server-list' into ameya-OC-10820-ec2-server-create