Trunk 4156 redesigned

Hi, 

Commit 8dd08a1 is a minor fix with the existing liquibasechangelog (unrelated to the story, but we cannot work without it). 

-Vinay