Final set of build fixes after Cstruct upgrade

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Update to 0.3.3

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Regenerate OASIS

Signed-off-by: David Scott <dave.scott@eu.citrix.com>