Add support for OpsWorks types

Change-Id: Ibafdbb74e4d55a05c864a2ef846f958598ee9093
Merge remote-tracking branch 'benley/opsworks'