Fix few missed issues with the reddwarf -> trove rename

There were a few files that were touched after the reddwarf->trove
rename that were still referencing "reddwarf". Changed these
references to "trove".

Fixed bug: 1194636

Change-Id: I7c7b014dee3b3a540baa84ad491812e17a8235ee
Merge "Fix few missed issues with the reddwarf -> trove rename"