added device encryption options
Merge branch 'master' of github.com:howech/cfndsl into eval-context
minor tweaks to the openstack definitions