TypeError when merging two Heat stacks without arguments

Change-Id: Ib05d128bcf66941510ce86eb5e8125f13e68d1d5