Use samples vocable in cm.publisher.test

This change use samples vocable in cm.publisher.test

Parts of the blueprint remove-counter

Change-Id: Ie9386a99bd78aa32c09e35ffac6e474aba4d09cf
Change counter to sample vocable in cm.energy

This changes counter to sample vocable in ceilomter.energy code

Parts of the blueprint remove-counter

Change-Id: I8045fb493489980e98a26434a09365248593ef63
Merge "Use samples vocable in cm.publisher.test"
Merge "Change counter to sample vocable in cm.energy"