Merge "Revert "Include DLUX dependencies to enable system test to pass on Jenkins""