fix some rebase failures (wip)
Fixed "remove_And_Add_All_Multi_Value_Attributes" integeration test
Merge pull request #25 from osiam/rebase_fixes

Rebase fixes