NTP, lucene - remove pmtpa remnants

remove more pmpta remnants from NTP
and lucene roles

Change-Id: Ie01cab829a1c2c1a11ec1628f4bb8e0392fdbdd1
Merge "NTP, lucene - remove pmtpa remnants" into production