Merge remote-tracking branch 'origin/test' into test

Conflicts:
	vmdb/app/controllers/miq_ae_class_controller.rb