contrail specific patch to cherry-pick 7fa1da9914e4ed44d7be8e70c50a133caa5aa6ed in contrail/icehouse_2014_1_3

Adding two files missing in last merge and reverting some code to take care of code review
comments

Change-Id: Ic393ad9f3f03e0bffdc25042681734a2f272939a