Can't update user password if encrypt_parameters_and_properties enabled

[huangtianhua]

1. create a stack with keystone user resource with the template:
****************************************
heat_template_version: 2016-04-08
parameters:
  pw:
    type: string
    hidden: true
resources:
  t_p:
    type: OS::Keystone::User
    properties:
      name: 'y'
      domain: test
      default_project: demo
      password: {get_param: pw}
      groups:
        - nonadmins
****************************************

2. after the stack create complete, update the stack to change password of the user, but the stack update failed, the reason is:
ValueError: too many values to unpack, the details in: http://paste.openstack.org/show/480593/

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/252736

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/252736
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=2fe6deee9b2dd0d94d860b1a5fad443d865d1327
Submitter: Jenkins
Branch: master

commit 2fe6deee9b2dd0d94d860b1a5fad443d865d1327
Author: huangtianhua <email address hidden>
Date: Thu Dec 3 09:45:35 2015 +0800

    Make sure update successful if there is encrypt param

    Don't append the param in env.encrypted_param_names again
    when encrypt hidden paramters, otherwise an error will raise
    when get template from db-object before decrypting.

    Closes-Bug: #1521925
    Change-Id: I4bdaa3391863cd18a451da4eee0cb9314c0057c5

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/257190

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/257190
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=faacb526969d3ed8575fff0802b469d3ccdad264
Submitter: Jenkins
Branch: stable/liberty

commit faacb526969d3ed8575fff0802b469d3ccdad264
Author: huangtianhua <email address hidden>
Date: Thu Dec 3 09:45:35 2015 +0800

    Make sure update successful if there is encrypt param

    Don't append the param in env.encrypted_param_names again
    when encrypt hidden paramters, otherwise an error will raise
    when get template from db-object before decrypting.

    Closes-Bug: #1521925
    Change-Id: I4bdaa3391863cd18a451da4eee0cb9314c0057c5
    (cherry picked from commit 2fe6deee9b2dd0d94d860b1a5fad443d865d1327)

[Thierry Carrez (ttx)]

This issue was fixed in the openstack/heat 6.0.0.0b2 development milestone.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/heat 6.0.0.0b2 development milestone.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/heat 5.0.1 release.