make database properties an example
add missing profile name
revert oid non-fix
heat template fixes and cleanups