[WIP] Fixes for MCP1.0 galera

Change-Id: I91f55d599f5291f34bfa81f55dafd6734606e1cc
3 files changed