Issue #2076171 by rfay: Fixed Improve entity property handling.
Issue #1486464 by rfay | Kunani: Passing ARGS for context filters?.
Merge branch '7.x-1.x' into 7.x-2.x

* 7.x-1.x:
  Issue #1486464 by rfay | Kunani: Passing ARGS for context filters?.
  Issue #2076171 by rfay: Fixed Improve entity property handling.