Merge branch 'cpan_mock_it' into QA
Merge branch 'f-1_api_rename' into QA

Conflicts:
	lib/Ok/MockIt/Utils.pm
	site_perl/Ok/MockIt/Class.pm
	site_perl/Ok/MockIt/Utils.pm