Remove the user from group while update user's password

[huangtianhua]

1. create a stack with a keystone user, the template is:
***************************************
heat_template_version: 2016-04-08
parameters:
  pw:
    type: string
resources:
  t_p:
    type: OS::Keystone::User
    properties:
      name: 'y'
      domain: test
      default_project: demo
      password: {get_param: pw}
      groups:
        - nonadmins
***************************************
2. the user create successful, and we can find the user in group 'nonadmins'

3. update the user with a new password, the stack update complete, but we can find the user was removed from the group 'nonadmins', the code handle_update() for user resource is incorrect, let' fix it.

4. there are also several other errors of user updation, will fix them together.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit a23e6a6b6361a7529fa18f274250b16caebc4fc4
Author: huangtianhua <email address hidden>
Date: Thu Dec 3 17:00:01 2015 +0800

    Don't remove user from groups if groups don't change

    If there is no change of 'groups' property when updating
    a keystone user resource, do not remove the user from
    the groups.

    Change-Id: Ib8e920e6ef95d654d0641e8635bd586047c89047
    Closes-Bug: #1522247

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 3dd5200c63b0d3b1c5b90fbb6a1e867e23394554
Author: huangtianhua <email address hidden>
Date: Thu Dec 3 17:00:01 2015 +0800

    Don't remove user from groups if groups don't change

    If there is no change of 'groups' property when updating
    a keystone user resource, do not remove the user from
    the groups.

    Closes-Bug: #1522247
    (cherry picked from commit a23e6a6b6361a7529fa18f274250b16caebc4fc4)

    Conflicts:
     heat/engine/resources/openstack/keystone/user.py
     heat/tests/keystone/test_user.py

    Change-Id: Ib8e920e6ef95d654d0641e8635bd586047c89047

[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.