Conflicts:
	src/app/controllers/roles_controller.rb
Menu - Fixes issue where menu updates did not correctly update API
controller.
Content views: fixing breaking test

Test is breaking in Jenkins with the following PostgreSQL error.

PG::Error: ERROR:  current transaction is aborted, commands ignored until end
of transaction block
       : SELECT COUNT(*) FROM "content_view_definitions"
Merge pull request #1611 from daviddavis/test_fix

Content views: fixing breaking test in Jenkins
Merge pull request #1614 from ehelms/menu-updates

Menu Updates