Put search field back in at least most Trean views
New Relic RUM support
[mms] Don't display empty mailbox action for mailboxes when Virtual Trash is active (Bug #12162).
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml