Afw test harness 1.5
merge in mnc-release history after reset to mnc-dev