Merge "fix file injection test to not assume /etc is present"