Reinstate build-common.xml changes overwritten by LRDOCS-429
Merge pull request #413 from jhinkey/build-common-xml-overwrites

Reinstate build-common.xml changes overwritten by LRDOCS-429
Front-ported changes from 6.1.x branch.