Merge "Add update method of security group name and description"

diff --cc quantum/db/securitygroups_db.py
Simple merge

diff --cc quantum/extensions/securitygroup.py
Simple merge

diff --cc quantum/tests/unit/test_extension_security_group.py
Simple merge