OCSADV-23: Made changes for Java 1.7 compatibility and generalized the EnableDisableComboBox component to its own reusable class.