Update manifest script to allow handling of local changes in a non-checkout
Merge pull request #25 from jgraham/sync_4f21917c2fe9b94d3e745d89f18c40869ff05b6f

Merge pull request #25 from sync_4f21917c2fe9b94d3e745d89f18c40869ff05b6f