Merge remote-tracking branch 'upstream/develop' into reports_controllers
switched to using named paths for reports controllers
Merge branch 'reports_controllers' into js_reconfig