ATLAS-1744: updated to address review comments and ATLAS startup failure

Signed-off-by: Madhan Neethiraj <madhan@apache.org>
3 files changed