Fix the bug when environment variables will wrongly override conf file
Fix the bug when environment variables will wrongly override conf file

nareshgundla/HiBench,maismail/HiBench,ConeyLiu/HiBench,ConeyLiu/HiBench,ConeyLiu/HiBench,qiansl127/HiBench,qiansl127/HiBench,maismail/HiBench,nareshgundla/HiBench,ConeyLiu/HiBench,nareshgundla/HiBench,maismail/HiBench,maismail/HiBench,qiansl127/HiBench,nareshgundla/HiBench,qiansl127/HiBench