fixes for contrail in RedHat

Change-Id: I914e3464f15b41aa5bbbc993813692a36167376a
4 files changed