(cherry picked from commit 9271c50c)

Conflicts:
	qadevOOo/runner/lib/Status.java
	qadevOOo/runner/util/PropertyName.java

Change-Id: I6157d7e4da5eeb85f3b748ab70cc6528b3d061a2