Cherry-pick of "Merge branch 'PoolCnvFixes-1.0-20171109' into '1.0'" into master
PoolCnv dependency generation update, 1.0 branch (2017.11.09.)
See merge request !169 (merged)
PoolCnv dependency generation update, 1.0 branch (2017.11.09.)
See merge request !169 (merged)