Merge branch 'devel' of github.com:/dmorse/simpatico into devel
Fixing Memory in containers unit tests.
Merge branch 'devel' of github.com:/dmorse/simpatico into devel
Merge branch 'devel' into sp