Homestyx hydra

R1:7b52dd767caa

Fix some bad merging; I landed an old branch for D5502.

Auditors: btrahan
Repository: R1 hydra
Commit Date: Apr 1 2013