LPS-31163

**Review** first following pull: https://github.com/juliocamarero/liferay-portal/pull/3068
**Important:** @almonwork has detected a big issue at 6.2 about using structurekey / templatekey at journalarticle. Before review this pull, speak with him