Merge "Added e2e scripts and modified Makefile" into dev/icn-v0.2.1