when replacing 'property' with 'the pursuit of happiness'. Least to say that 'the pursuit of happiness'by itself imposes no constrain on human nature (state of war). The connotations of it can be the war with others, so far as you are happy.
'Property' on the other hand is a neccesity for one to survive and it is equivallent to 'making a living'. It is a fundamental need although not neccesarily a happiness.
In this sense, Locke was rhetorically and politicaly correct.