Remove rule-of-three warnings.

Change-Id: I4a057055782cec871baf1b8804a85f10c81d50d0
Merge topic 'octree-rule-of-three' into master

e8bc3b4b Remove rule-of-three warnings.