Fixed a bug in master to properly reconcile completed frameworks
during slave re-registration.

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