Thailand's king has officially reinstated his mistress Sineenat as his royal consort after releasing her from jail to rejoin his harem.