Armenia and Azerbaijan appear to have resolved their differences on two negotiating points, clearing the way for the signing of a peace agreement that would end more than 35 years of conflict.