Merge pull request #352 from hflynn/9538

9538 fix
Merge pull request #357 from sbesson/jenkins_tiny_fix

Minor fixes reported by Mark
merge dev_4_4 -D org -I include -E exclude: PR 346 (Training update april 13 1)
merge dev_4_4 -D org -I include -E exclude: PR 358 (Cpp: libpath and documentation improvements)