fixes puppet common env path and disco setup bugs