Revert "Merge pull request #183 from sbavanasi/R1.06"

This reverts commit 69b0e1ef1186d8f4a03a6c8607877ffc91d6944f, reversing
changes made to 7bce42417a845e52c27b674fbea43a80707a4f98.

Reverting this changes as it has broken some multiselect functionality
in policy page
Merge pull request #196 from nagakiran/r1.06_revertComboBoxFix

R1.06 revert combo box fix