Bug 2294: Handle Shard backwards compatibility

Implemented as outlined in Bug 2294.

Change-Id: I14aa8ef5f320f9d165492396ece4ea63cce9b0c3
Signed-off-by: tpantelis <tpanteli@brocade.com>
Merge "Bug 2294: Handle Shard backwards compatibility"