Another attempt

@jwpeterson

```
git reset <SHA of my first commit for this stuff> 
git checkout -b peacock-2_test upstream/devel
git commit -am "..."
```