Add a spec for issue #2124 (I think)
Fix for issue #2124

 - don't complain if local_override being updated anyway
Arguably a cleaner fix for issue #2124
Note change in changelog