Updated integration tests to use proper openstack-floating-ip openstack-private-network option
Reverting previous 2 commits
Added .travis.yml for knife-openstack
Fixed merge issue: we only call the validate_params from the server create class
(cherry picked from commit f66ae539293373d9e4091057d6b945819a112983)
Added validation for openstack winrm password
(cherry picked from commit 288636b36719d25ccc6e81acb554753317b4ebee)
Fixing gem file dependency
(cherry picked from commit 0c99ec753a9b6a0ebfde92844fc849c28de0328b)

Conflicts:

	Gemfile
Fixed unit tests that failed after merge
(cherry picked from commit a1fd2362c3e03065774e0b688684bd4875f92087)
Updated integration tests to add missing ssh-key option
(cherry picked from commit 54f45e11b841b4c01fcdbab8ad6c7739c6d150fa)
Marked floating ip related integration test as a pending
(cherry picked from commit 06381a1b151d82ae42df90eb69005b8037760b4b)

Conflicts:

	spec/integration/openstack_spec.rb
Marked openstack-private-network option related integration tests as pending
(cherry picked from commit 717067906c6068704ebb24619d3946cd65315ff7)

Conflicts:

	spec/integration/openstack_spec.rb
Updated travis config file to use ruby 1.9.1
Updated travis config file to use ruby 1.9.2 and remove 1.9.1
Merge branch 'sid-oc-9108-knife-openstack-travis' of https://github.com/ClogenyTechnologies/knife-openstack into sprint86-merged