Update to latest catapult (be85e5fd) bug:31335915 bug:31340203 bug:31551133 Change-Id: I844b83711c56f3ea8a6d0bf254a1187b62c33f81