Fix errors in templates and base types

These fixes are necessary for testing the code in subsequent patches
to handle the first part of the monitoring use case:  deploy MongoDB
and NodeJS on 2 servers

Change-Id: I0b8c0501e6865c92eb092922465afcf3a040e8d7
Merge "Fix errors in templates and base types"