Finish merging copytool branch

This is the last MR to move the copytool branch to devel.

It brings in code formatting changes from ostk, to align the formatting style of both projects.