Cleanup shocco errors

Change-Id: I39372a96d3ca0880c4f8d51e2d68607a7b643432
More neutron renames

Change-Id: I4dab635c2ae79f1f42a9cfdadbf7a4d06cf2b925
Merge branch 'screen-stop' into dt-test
Merge branch 'doc-shocco-cleanup' into dt-test
Merge branch 'update-usb-tools' into dt-test