TEZ-1131 addendum for missing fix. Simplify EdgeManager APIs (bikas)