Moves this to where it should be.
Merge remote-tracking branch 'nbites/master'

Conflicts:
	src/share/messages/autowrap/test/test_package.proto