BUG 2820: Fix breakage from Import-Package
BUG 2820: Fix breakage from Import-Package

Change-Id: I41401d4745c2126ccdc7ed9dffee3299aae9ed0c
Signed-off-by: Ed Warnicke <6bfea2c617e4cc851d6eb93a06d7aa0bb865db55@gmail.com>
Signed-off-by: Jozef Gloncak <93ae3d3993b13ba68c9ddb2c57b69b85d87b713a@cisco.com>
(cherry picked from commit 6759779bebf8d724f35518c45a114cca2a0da60c)

mandeepdhami/controller,tx1103mark/controller,522986491/controller,Sushma7785/OpenDayLight-Load-Balancer,tx1103mark/controller,mandeepdhami/controller,opendaylight/controller,522986491/controller,Sushma7785/OpenDayLight-Load-Balancer,mandeepdhami/controller,Johnson-Chou/test,mandeepdhami/controller,tx1103mark/controller,inocybe/odl-controller,Johnson-Chou/test,inocybe/odl-controller,tx1103mark/controller