Fix for issue#20645
Fix for issue#20645

Iristyle/hiera,hlindberg/hiera,MikaelSmith/hiera,johnduarte/hiera,hlindberg/hiera,Iristyle/hiera,johnduarte/hiera,justinstoller/hiera,Iristyle/hiera,hlindberg/hiera,justinstoller/hiera,justinstoller/hiera,MikaelSmith/hiera,johnduarte/hiera,ferventcoder/hiera,ferventcoder/hiera,MikaelSmith/hiera,ferventcoder/hiera