HomeFreeBSD

Merge missing mergeinfo for r303877