Revert "Changed the default agent token to property"

This reverts commit 293ee000fff0351a7386a4bd02b47335bdd06660.
Merge branch 'master' into composite