Bug 507598 - Comparator errors in M20161116-0400 Change-Id: Id253f7277788b5771daf58d1c8b001381ed50a92 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>