Fix and update extract_opts group extraction

Same as the one sent to nova:
https://review.openstack.org/#/c/30251/

Change-Id: Iba3c31b320ed93deb295a22cd01518e05bfee8ce
Signed-off-by: Julien Danjou <julien@danjou.info>