Few UI fixes related to template, role & subnet.
Merge pull request #1698 from kbidarkar/sat6-z_stream

Few UI fixes related to template, role & subnet.