LRDOCS-794: Instruct reader to add VM templates so parsing is successful (6.1.x) and added other minor updates
Merge pull request #718 from codyhoag/themes-fix-6.1.x

Themes updates for 6.1.x