Changes to fix MMS in v2.1

there's a marionette method called, is_enabled().
self.parent.wait_for_condition(lambda m: m.find_element(*<locator>).is_enabled)

This should do the trick