Merge pull request #2104 from apache/abderrahim/dynamic-session-elements

Correctly track session elements in dynamic build plan