Fix Search Results for Clipboard Block

Fix Search Results for Clipboard Block

- Add `getSearchableContent` method to
  `CoreScrapbookDisplayBlockController` which calls original block
  (bOriginalID) method if it exists
Merge pull request #1224 from mkly/fix_clipboard_searchable_content

Fix Search Results for Clipboard Block
Fix Layout Save Issue

Fix layout save issue

Layout does not save when editing. Only saves when adding.

- Align method `Layout::isUniqueToCollectionVersion()` to actually check
  if unique to collection version as opposed to checking if unique to
	page
Merge pull request #1225 from mkly/fix_layout_save_issue

Fix Layout Save Issue