Merge remote-tracking branch 'mirantis/stable/folsom' into stable/grizzly

Port Mirantis folsom tempest

Conflicts:
	etc/tempest.conf.tpl
	tempest/common/rest_client.py
	tempest/config.py
	tempest/manager.py
	tempest/services/nova/xml/servers_client.py
	tempest/tests/compute/base.py
	tempest/tests/compute/floating_ips/test_floating_ips_actions.py
	tempest/tests/compute/floating_ips/test_list_floating_ips.py
	tempest/tests/compute/images/test_image_metadata.py
	tempest/tests/compute/images/test_list_image_filters.py
	tempest/tests/compute/servers/test_create_server.py
	tempest/tests/compute/servers/test_list_server_filters.py
	tempest/tests/compute/servers/test_server_actions.py
	tempest/tests/compute/servers/test_server_addresses.py
	tempest/tests/compute/test_authorization.py
	tempest/tests/compute/test_console_output.py
	tempest/tests/compute/test_disk_config.py
	tempest/tests/compute/test_images.py
	tempest/tests/compute/test_server_metadata.py
	tempest/tests/compute/test_server_personality.py
	tempest/tests/compute/test_servers.py
	tempest/tests/compute/test_servers_negative.py
	tempest/tests/compute/volumes/test_attach_volume.py
	tempest/tests/network/base.py
	tempest/tests/volume/base.py
	tempest/tests/volume/test_volumes_actions.py
	tempest/tests/volume/test_volumes_get.py
	tools/pip-requires
	tools/test-requires

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>