[PATCH 1/3] Replacing deprecated <ind:environmentvariable_...> tags with <ind:environmentvariable58_...> tags