Removed commented cruft from Makefile snipps
Added further snippets for prod and test objects
Small tweaks to new snippets
Merge branch 'feature/makefiles' into develop
Merge branch 'release/6.10.0'