Test fix
Merge pull request #780 from dmnjohns/build-fix

Fix For Build Issue
technical todo update
Merge branch 'master' into B-52618_akka