Fix for issue #1538
update backport to match cf11 implementations
update backport to match cf11 implementations
Merge pull request #1539 from stevewithington/develop

update backport to match cf11 implementations
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop