merging master
fixing node_metadata_generate action after merge
Merge pull request #3737 from jlsherrill/cv-rework-merge

Merging master to cv-rework
initial cv publishing work
Merge pull request #3716 from jlsherrill/cv-promote

initial cv publishing work
fixing "the input_format has already been defined in Class" error
Merge pull request #3741 from jlsherrill/input_fix

fixing "the input_format has already been defined in Class" error
Merge remote-tracking branch 'upstream/master' into cv-wat

Conflicts:
	config/routes/api/v2.rb
Fixing broken tests by reloading models and fixing relationships
Merge pull request #3746 from daviddavis/cv-wat

Merge master into cv-rework
Content Views: Adding filter UI support for Packages, Errata and Package groups.