RESOLVED bug - 511105: Ensure Mars compatibility & fix compilation errors under Oxygen due to internal API usage https://bugs.eclipse.org/bugs/show_bug.cgi?id=511105