Operation Template changes #1

Open
thameera wants to merge 2 commits from thameera/product-iots-community:feature/operation-template into master