Dictionary Fixes, 1.0 branch (2017.04.04.)
This is the cherry-pick of the "relevant part" of !21 (merged) into the 1.0 branch. Fixing ATLINFR-1644 for the 21.0 branches of atlas/athena.
This is the cherry-pick of the "relevant part" of !21 (merged) into the 1.0 branch. Fixing ATLINFR-1644 for the 21.0 branches of atlas/athena.