SERXIONE-2779: prefer systemproperties over env variable Change-Id: I90d4c7983096e1150412f90ecb735fbf79061f5a