fix deployment bug and add databag templates

Change-Id: I070a3ee788e2f39814265533ed96332a2d8bed78
Merge "fix deployment bug and add databag templates" into dev/experimental