Makefile.defs: version set to 3.3.5
ChangeLog: updated for v3.3.5
Merge remote-tracking branch 'origin/3.3' into flowroute-3.3

Conflicts:
	modules/json
	modules/jsonrpc-c