Fix issue #2796 (AWS describe_dhcp_options request parsing)

Properly initialize @dhcp_options for each dhcpOptionsSet
Merge pull request #2797 from knatsakis/master

Fix issue #2796 (AWS describe_dhcp_options request parsing)