fw: delete deprecated Strategy::getName in favor of getInstanceName

This commit also renames strategy_choice::Entry::getStrategyName
to getStrategyInstanceName.

refs #3868

Change-Id: I40301e744fc236918d6be1c1262eba952198e22f
diff --git a/tests/daemon/mgmt/strategy-choice-manager.t.cpp b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
index 667dbf3..f1121ea 100644
--- a/tests/daemon/mgmt/strategy-choice-manager.t.cpp
+++ b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
@@ -202,7 +202,7 @@
   std::set<Name> actualNames, actualStrategies;
   for (const auto& entry : m_strategyChoice) {
     actualNames.insert(entry.getPrefix());
-    actualStrategies.insert(entry.getStrategyName());
+    actualStrategies.insert(entry.getStrategyInstanceName());
   }
 
   std::uniform_int_distribution<uint64_t> dist;
diff --git a/tests/daemon/table/strategy-choice.t.cpp b/tests/daemon/table/strategy-choice.t.cpp
index ebcd9db..e827321 100644
--- a/tests/daemon/table/strategy-choice.t.cpp
+++ b/tests/daemon/table/strategy-choice.t.cpp
@@ -216,7 +216,7 @@
 
   std::map<Name, Name> map; // namespace=>strategyName
   for (StrategyChoice::const_iterator it = sc.begin(); it != sc.end(); ++it) {
-    map[it->getPrefix()] = it->getStrategyName();
+    map[it->getPrefix()] = it->getStrategyInstanceName();
   }
 
   BOOST_CHECK_EQUAL(map.at("/"),      strategyNameP);