Fix data server specs
Fix bug in siebel profiles import
Add additional merge logic for merging users