Added on-demand integrity scans to C++ master
Added on-demand integrity scans to Java master

Untested at this point.  May require future fixes.  (Or may not?)