Adds proper fix for select/option

Related to [#9436](https://github.com/emberjs/ember.js/issues/9436)
whaaaat. I don't doubt it. But that is whack. I'll try to take another look and sync up today.