merge

Add System Property configuration in addition to System Environment variables