Merge pull request #71 from asbalaji/R1.06

Fixed Bug ID 2611,1325489
Reverting the changes required to enable multiple service chaining from R1.06