Privacy controls, integration test harness, and state-locking fixes#4

winjer merged 9 commits into

mainisotoma/code-trace:mainfrom

privacy-changesisotoma/code-trace:privacy-changesCopy head branch name to clipboard