TEZ-1131 addendum for missing fix. Simplify EdgeManager APIs (bikas)
TEZ-1241 Consistent getter for staging dir (kamrul)