Merge "Changes in different modules"

diff --cc interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
index 6057d691e51d0876ba48849bad5c0feea753d6a2,e09e159d3e9f1b281cc8711a4002c0e78fbf00d5..788292db8efe958f66d2b479797f6867a14bad7b
mode 100755,100644..100755
--- 1/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
--- 2/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java