forward port since tags to 2.6.1 for items merged to nexus-oss-2.6.1.x branch