Merge branch 'release/7.x-0.20' into develop
set search to handle custom search params in $conditions instead of query string
set default values for $preprocessed
add id to watchdog message
1016-BUG_show_type_unknown
resolve merge conflicts
Fix php error
Version bumped to 7.x-0.21
Merge branch 'release/7.x-0.21'