jj-squash

Squash changes from working copy into relevant ancestor commits