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
Merge pull request #2362 from JamesFerguson/1-3-stable

Fixes #2124: ignore bad local override revisions if updating the dependency anyway

Conflicts:
	CHANGELOG.md