CONN-807: Fixed the build to remove all Direct related references in non-direct build
Merge pull request #918 from nareshcgi/CONN-807

CONN-807: Fixed the build to remove all Direct related references in non-direct build