Update to latest upstream XBlock API changes