Comment 7 for bug 1598672

Actually only needs backporting to 16.04 - I was originally testing with a 16.10 db and so the site template number was wrong when testing 15.04/15.10 code base.

A good lesson to create new database at 15.04 and work/upgrade forward