Remove sampleapp from setup.py

and ensure the scaffold gets included in dists
Add change note
Merge branch 'upstream_merges' into make_scaffold