updated Production feature
Merge branch 'releasev4.2.1'

Conflicts:
	sites/default/modules/features/white_guide_production/white_guide_production.views_default.inc