Merge pull request #1 from xtuple/master

Catch up.
Merge branch 'xtuple'
Merge branch 'xtuple'
issue #20874: Move "ppm" to publicy available "time expense"
issue #20874: fix extension name
Merge pull request #10 from shackbarth/20874b

issue #20874: Move "ppm" to publicy available "time expense"