Backport Adding ipam options to ipam driver requests #2324

[abhi]

Since cherry pick fails due to code reorg, I have manually updated the respective files.
(cherry picked from commit fe0d7f6)
(cherry picked from commit ed271d4)

[codecov]

Codecov Report

Merging #2394 into bump_v17.06 will increase coverage by <.01%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v17.06    #2394      +/-   ##
===============================================
+ Coverage        59.75%   59.76%   +<.01%     
===============================================
  Files              120      120              
  Lines            25067    25093      +26     
===============================================
+ Hits             14980    14998      +18     
- Misses            8754     8759       +5     
- Partials          1333     1336       +3

[nishanttotla]

@abhi just a small quick thing: Can you refer to the two commits from #2324, so that the commit message looks somewhat like a cherry pick? It'll be useful to track back later.

[abhi]

@nishanttotla done.

[nishanttotla]

@abhi I actually meant that the commit hashes should go into the commit message, not just PR description. Something like
(cherry picked from commit fe0d7f63cd93f9cb65c8533393a1447f4f55c63c)
(cherry picked from commit ed271d4ae37d782f53d70f04535850239aff2722)

[nishanttotla]

LGTM once commit message is updated.

Ping @dperny @anshulpundir

[abhi]

Please do not merge yet. I might need to update libnetwork vendoring due to a last minute change going in.

[nishanttotla]

@abhi can the libnetwork update be done in a separate cherry pick if it indeed is required?

[abhi]

@nishanttotla unfortunately no. I guess release branch needs to have consistent vendoring. PR moby/libnetwork#1970 is reverting a change in the bump_17.06 branch. So we might need to honor it.

[dperny]

LGTM