Include vdata in nested calculated props

[nolanpro]

To reproduce the problem:

screen: FOUR-4853.json.txt
Create a calculated prop called output with js return this.foo.one;
Create a screen with an input name foo.two
Create a rich text that shows the output variable
Go to preview and add this example input data

{
    "foo": {
        "one": "one",
        "two": "two"
    }
}

Expected: output should show one
Actual result: no output

The problem is that the calculated props input data is not merged with the vdata.

Proposed solution is to merge those objects

Need to make sure this solution does not break the solution for https://processmaker.atlassian.net/browse/FOUR-2797