intelli_plug: code clean up and minor bug fixes

bump to version 1.6

Change-Id: I7f23b42a0054b1053d8397598beaf6d93474c049