HCSVLAB-494 Fix AAF config file + metrics improvement
Merge branch 'master' of github.com:IntersectAustralia/hcsvlab