Fix /NetworkDriver.Join api validation

[vikas choudhary]

{
    u'NetworkID': u'45d5a3742767122011568cac8f97364c1320d3d95ed887b7bc45f4a2198fde93',
    u'SandboxKey': u'/var/run/docker/netns/576760c8cec1',
    u'Options': None,
    u'EndpointID': u'5d90c390f684386c4ee8ff5f630fe18f3648632365dd6a80970b7d676486308b'
}

root@vikas-VirtualBox:~# docker run --net=xy -itd --name=conza busybox
075a4395ee9d2d38d471e1fa22bf701ab67a9a4f5e71d544871fed2f46659765
Error response from daemon: Cannot start container 075a4395ee9d2d38d471e1fa22bf701ab67a9a4f5e71d544871fed2f46659765: Plugin Error: NetworkDriver.Join, {
  "Err": "None is not of type u'object'\n\nFailed validating u'type' in schema[u'properties'][u'Options']:\n {u'description': u'Options.', u'example': {}, u'type': u'object'}\n\nOn instance[u'Options']:\n None"

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/237484

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/237484
Committed: https://git.openstack.org/cgit/openstack/kuryr/commit/?id=dd1a0ce5fb390927bedfc55e756392e581f79ca7
Submitter: Jenkins
Branch: master

commit dd1a0ce5fb390927bedfc55e756392e581f79ca7
Author: Vikas Choudhary <email address hidden>
Date: Tue Oct 20 15:02:17 2015 +0530

    Fix /NetworkDriver.Join api validation

    In json data, 'Options' are coming as 'None'. For handling same
    , changes are being pushed for allowing type as 'null' also.

    Change-Id: Ibc3844d0bbec3ac0b6090ea5f9ef953c7b2fe944
    Closes-Bug: #1507954