EUCA-7484 - Ensure that options has a default if it's null.
Merge pull request #33 from eucalyptus/jpommer/dev/EUCA-7484

Jpommer/dev/euca 7484