commit 883f1e334cc528ed1523d2d1d1dd04696ddf2236 (HEAD, origin/onos-1.6, onos-1.6)
Author: Hyunsun Moon [hyunsun.moon@gmail.com]
AuthorDate: Wed May 18 21:28:06 2016 -0700
Commit: Gerrit Code Review [gerrit@onlab.us]
CommitDate: Thu Jun 2 01:03:25 2016 +0000

Make some DHCP options and host discovery configurable
--
(cherry picked from commit 04b1fe9adab1382e89a743174b40505f900cd6b9)

<iframe src="https://onos-jenkins.onlab.us/job/HAswapNodes/plot/Plot-HA/getPlot?index=0&width=500&height=300"noborder="0" width="500" height="300" scrolling="yes" seamless="seamless"></iframe>