Merge "Remove state_dir from setMountsMap" into feature/zuulv3