move content block link abstraction out into a core helper class. See issue #242
modify unit tests to use new LinkAbstractor helper
Merge branch 'develop' into jordanlev-master