Merge "Fixed bug on pending environment use of termination condition. With regression test."
am: 27fb1dc467

Change-Id: I606f6dadc4705179e501cebb90e47582387ad3f4