Merge "Removed old fake slave hacks used for debug log testing"