backward compatible master:pillar:reclass

Change-Id: I7636e3b43996abfa8be21f58ff485d998eacf74c
2 files changed