Merge "fix(corstone-1000): fix Makefile error reporting" into integration