Merge "Adjust services robotest makefile"