LPS-36710 Enable site creation based on Site Templates when Staging already enabled

Hi Dani,

You already reviewed this code several months ago. Now that I have time to fix it, I realized that I don't really understand what you meant about the fixes I should do to complete it.

Based on our discussion I rebased, and retested the code and send it to you for further review.

Should you have any concerns or questions, please let me know.

Cheers,
Vili