Merge pull request #4020 from thinkyhead/rc_test_M600

Fix Travis test for FILAMENTCHANGEENABLE

.travis.yml

   # Enable FILAMENTCHANGEENABLE
   #
   - restore_configs
-  - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER
+  - opt_enable ULTIMAKERCONTROLLER
+  - opt_enable_adv FILAMENTCHANGEENABLE
   - build_marlin
   #
   # Enable filament sensor