Rebase changes on upstream master

This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Makefile

@@ -155,6 +155,9 @@ posix_sitl_ekf2:
 ros_sitl_default:
 	@echo "This target is deprecated. Use make 'posix_sitl_default gazebo' instead."
 
+ros_sitl_default:
+	$(call cmake-build,$@)
+
 qurt_eagle_travis:
 	$(call cmake-build,$@)
 

cmake/configs/nuttx_px4fmu-v2_default.cmake

@@ -83,6 +83,7 @@ set(config_module_list
 	modules/attitude_estimator_q
 	modules/ekf_att_pos_estimator
 	modules/position_estimator_inav
+	modules/ekf2
 
 	#
 	# Vehicle Control

cmake/posix/px4_impl_posix.cmake

@@ -182,6 +182,7 @@ if(UNIX AND APPLE)
 
 else()
 
+
         set(added_definitions
 		-D__PX4_POSIX
 		-D__PX4_LINUX

src/modules/systemlib/circuit_breaker_params.c

@@ -42,6 +42,8 @@
  * parameter needs to set to the key (magic).
  */
 
+#ifdef __PX4_QURT
+
 /**
  * Circuit breaker for power supply check
  *