lots of changes
Lots of changes
Merge branch 'master' of https://github.com/prafiles/fortinetloginiiitd

Conflicts:
	linux/fortinet2.py