Deal will allow Dr. Ahmad Mahajneh to complete residency at Ein Kerem medical center, though sides reportedly still at loggerheads over how to deal with confrontation with cops