Adds proper fix for select/option

Related to [#9436](https://github.com/emberjs/ember.js/issues/9436)