Fido

Merge of branch dev/issue-5032.
refs #5032

Conflicts:
	src/FPRClient/share/mysql_dev1
	src/MCPClient/debian/control
	src/MCPServer/share/mysql_dev1