AETHER-3077 Add support for 2.0 ROC models, refactoring

Change-Id: I39807ca14c757cfcf8bef0a5d48d8451d8727f89
25 files changed