merging patches in hydro branch.

* yaml-cpp 0.5+ support.