Merge branch 'git-protocol-respect'
Merge branch 'update_uvcmetrics'
added (back?) atm files needed for test case
Merge branch 'uvcmetrics_more_sample_files' into devel