Entity header should always return the version
test of entity header change for SWC-485
added null check
Merge pull request #545 from dburdick/swc-485

Swc 485 & SWC-491