Merge pull request #2788 from cben/tag-mapping-factory

Fix test errors with :container_label_tag_mapping factory

spec/views/ops/_label_tag_mapping_form.html.haml_spec.rb

@@ -41,7 +41,7 @@
 
   context 'edit existing mapping' do
     before(:each) do
-      @lt_map = FactoryGirl.create(:container_label_tag_mapping)
+      @lt_map = FactoryGirl.create(:tag_mapping_with_category)
       @edit = {:id  => nil,
                :new => {:options    => [["<All>", nil]],
                         :entity     => nil,