Merge "Fix profile merges in profman"