Merge "Ensure that the zuul home can be traversed"