env.py: Simplify some logic
env.py: Simplify some logic

Simplify some configuration merging logic.

credp/lisa,credp/lisa,ARM-software/lisa,credp/lisa,ARM-software/lisa,ARM-software/lisa,ARM-software/lisa,credp/lisa