Some POM options are moved into separate category (#12678).

Change-Id: I7f1a87c98ffde64cb0ac4d3168115389a08f6f5b