Merge "Allow applications to define failure handlers" into oc-mr1-dev