[TECHNICAL-SUPPORT] LPS-32325 Small image not available in template when image uploaded to Web Content

How to reproduce the issue
1. Create a Web Content structure (doesn't matter what kind of fields are added)
2. Create a (velocity) template for the previously created Structure that contains a reference to reserved-article-small-image-url variable. E.g. <img src="$reserved-article-small-image-url" />
3. Create a Web Content with the previously created Structure and Template. Upload an image as a small image in the Abstract section and check Use Small Image checkbox.
4. In Asset Publisher the summary and small image is shown, but when you click "read more" the image is not displayed. The summary view of the Web Content does not use the velocity template, but simply references the image URL. The image URL is not available in the template if the image is uploaded (it works fine when the user saves the URL of an image).

Resolution
reserved-article-small-image-url variable is populated in JournalUtil.addAllReservedEls(). It took care of the image if the URL had been given. If there was an uploaded image the template variable remained empty. The behavior has been changed to this: if the URL is empty, but there is an image uploaded then populate the template variable with a URL generated based on the image ID. ThemeDisplay was needed to put together the image URL so I have added this parameter to addAllReservedEls(). The modified method was referenced in two other places which has been tested using the URLs below. They give back an XML which contains the small image URL after applying the fix.

http://localhost:8080/c/journal/get_articles?cmd=view&groupId=10177&articleId=10461&version=1.1
http://localhost:8080/c/journal/get_article?cmd=view&groupId=10177&articleId=10461&version=1.1

Please review my changes. 

Thanks,
Akos