Refs #9643. Fixed conflicts and others.

Conflicts:
	Test/AutoTestData/pid_offset_vulcan_new.dat

And
1. Rebased by master;
2. Fixed cppcheck warnings;
3. Fixed a sphinx doc error due to change in definition of bank ID.