Adds proper fix for select/option

Related to [#9436](https://github.com/emberjs/ember.js/issues/9436)
@rwjblue @mixonic I spend more than 2 hours looking into it, probably need another pair of eyes.