I'd +1 merging this now and then fixing the locators once they change. A good indicator that the locator has been updated is the test will begin to fail.

When filing a bug we should use it as a chance to educate the devs on what types of locator - point them to the style guide - work best for QA and test automation.