Merge proposals dependent on lp://staging/~therp-nl/ocb-server/6.1-attachment_search_invalid_model

1. 6.1-attachment_search_invalid_model
2. Dependent merge proposals