Merge changes Iae29d0c8,Ia37364e4,I6e0f8f77 into lp5.1

* changes:
  slim: envsetup: force all variables to be local
  slim: envsetup: add an append method for hmm
  slim: envsetup: add new entries for hmm