Fixed the slave to ignore messages not originating from the expected
master.

Review: https://reviews.apache.org/r/14541
Fixed a crash in the master during framework re-registration.

Review: https://reviews.apache.org/r/14548