2015-07-11 - releng
03:54	<bd808>	fixed rebase conflict with "Enable firejail containment for zotero" by removing stale cherry-pick	[releng]