Node/service tags now cleared on instance stop - EUCA-8982

Clearing the service tag as well as the node tag on stop allows both
tags to be set when the instance is started.

EUCA-8982
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8982' into testing