thinking about this more since this is in the Executor and on yarn that will only be set via the ENV variable I will change this to only look at the env variable.  I will also look more to see why it uses the property in some cases but I will do that under separate issue if that is ok with you?