Merge "Fixed bug related to icn/daaas jjb template"