shaping pom.xml #67

cannot cherrypick from master. some conflicts.
merge
36780666f50c6cafe03e6f0b3713aa1dac0ac632
e0519f4473baa10a8736c2e10e24efc53b96d36a
9b936dc7521516f1697140da1d00964fdbd77528
1c3a707214685d506a25c37b962f4d5bb6c647ba
b3ca467915115dc3ede2846de41a326a2800f8b9
from merge master commit d92f41335a505a0092da4a4f7e4379bb6b0782e5