Fix #1341 - Cherrypull fails if local changes found