Merge branch 'CHEF-5223'

Conflicts:
	CHANGELOG.md
Merge pull request #1387 from opscode/adamed/CHEF-5211

CHEF-5211: 'knife configure --initial' fails to load 'os' and 'hostname' ohai plugins properly
Update CHANGELOG for 5211
Bump version for 11.12.4.rc.0
Merge pull request #1388 from opscode/adamed/11-stable

Merge for release 11.12.4.rc.0