fix for 2462 from bitbucket

Pull https://bitbucket.org/contrail_admin/ctrlplane/commits/33e7761fd4755e5404e427f0d73ca256a0c5ab31/raw/ to mainline