LRDOCS-404 simplify numbering headers

This is for trunk only. Thanks.