Merge branch 'master' into sydel

Conflicts:
	etc/discovery_runs.cfg
	libexec/check_IBM_DS_health.sh
	shinken/modules/graphite_ui.py
Merge branch 'sydel' of https://github.com/claneys/shinken into sydel
Merge branch 'master' into sydel

Conflicts:
	etc/packs/databases/oracle/services/connected_users.cfg
	etc/packs/databases/oracle/services/connection_time.cfg
	etc/packs/databases/oracle/services/corrupted_blocks.cfg
	etc/packs/databases/oracle/services/datafile_io_time.cfg
	etc/packs/databases/oracle/services/datafile_io_traffic.cfg
	etc/packs/databases/oracle/services/datafiles_existing.cfg
	etc/packs/databases/oracle/services/enqueue_contention.cfg
	etc/packs/databases/oracle/services/enqueue_waiting.cfg
	etc/packs/databases/oracle/services/event_waiting.cfg
	etc/packs/databases/oracle/services/event_waits.cfg
	etc/packs/databases/oracle/services/invalid_objects.cfg
	etc/packs/databases/oracle/services/latch_contention.cfg
	etc/packs/databases/oracle/services/latch_waiting.cfg
	etc/packs/databases/oracle/services/pga_in_memory_sort_ratio.cfg
	etc/packs/databases/oracle/services/process_usage.cfg
	etc/packs/databases/oracle/services/redo_io_traffic.cfg
	etc/packs/databases/oracle/services/retry_ratio.cfg
	etc/packs/databases/oracle/services/rman_backup_problems.cfg
	etc/packs/databases/oracle/services/roll_block_contention.cfg
	etc/packs/databases/oracle/services/roll_extends.cfg
	etc/packs/databases/oracle/services/roll_header_contention.cfg
	etc/packs/databases/oracle/services/roll_hit_ratio.cfg
	etc/packs/databases/oracle/services/roll_wraps.cfg
	etc/packs/databases/oracle/services/seg_top10_buffer_busy_waits.cfg
	etc/packs/databases/oracle/services/seg_top10_logical_reads.cfg
	etc/packs/databases/oracle/services/seg_top10_physical_reads.cfg
	etc/packs/databases/oracle/services/seg_top10_row_lock_waits.cfg
	etc/packs/databases/oracle/services/session_usage.cfg
	etc/packs/databases/oracle/services/sga_data_buffer_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_dictionary_cache_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_latches_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_gethit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_pinhit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_reloads.cfg
	etc/packs/databases/oracle/services/sga_shared_pool_free.cfg
	etc/packs/databases/oracle/services/sga_shared_pool_reloads.cfg
	etc/packs/databases/oracle/services/soft_parse_ratio.cfg
	etc/packs/databases/oracle/services/stale_statistics.cfg
	etc/packs/databases/oracle/services/switch_interval.cfg
	etc/packs/databases/oracle/services/sysstat.cfg
	etc/packs/databases/oracle/services/tablespace_can_allocate_next.cfg
	etc/packs/databases/oracle/services/tablespace_fragmentation.cfg
	etc/packs/databases/oracle/services/tablespace_io_balanc.cfg
	etc/packs/databases/oracle/services/tablespace_remaining_time.cfg
	etc/packs/databases/oracle/services/tablespace_usage.cfg
	etc/packs/databases/oracle/services/tnsping.cfg
	etc/packs/os/linux/commands.cfg
	etc/packs/os/linux/services/cpu.cfg
	etc/packs/os/linux/services/disks.cfg
	etc/packs/os/linux/services/load.cfg
	etc/packs/os/linux/services/memory.cfg
	etc/packs/os/linux/templates.cfg
	modules/ui_graphite/module.py
Fix: Adjust fs_rules discovery rules
Merge branch 'sydel' of https://github.com/claneys/shinken into sydel

Conflicts:
	etc/packs/databases/oracle/services/connected_users.cfg
	etc/packs/databases/oracle/services/connection_time.cfg
	etc/packs/databases/oracle/services/corrupted_blocks.cfg
	etc/packs/databases/oracle/services/datafile_io_traffic.cfg
	etc/packs/databases/oracle/services/enqueue_contention.cfg
	etc/packs/databases/oracle/services/enqueue_waiting.cfg
	etc/packs/databases/oracle/services/event_waiting.cfg
	etc/packs/databases/oracle/services/event_waits.cfg
	etc/packs/databases/oracle/services/invalid_objects.cfg
	etc/packs/databases/oracle/services/latch_contention.cfg
	etc/packs/databases/oracle/services/latch_waiting.cfg
	etc/packs/databases/oracle/services/pga_in_memory_sort_ratio.cfg
	etc/packs/databases/oracle/services/process_usage.cfg
	etc/packs/databases/oracle/services/redo_io_traffic.cfg
	etc/packs/databases/oracle/services/retry_ratio.cfg
	etc/packs/databases/oracle/services/rman_backup_problems.cfg
	etc/packs/databases/oracle/services/roll_block_contention.cfg
	etc/packs/databases/oracle/services/roll_extends.cfg
	etc/packs/databases/oracle/services/roll_header_contention.cfg
	etc/packs/databases/oracle/services/roll_hit_ratio.cfg
	etc/packs/databases/oracle/services/roll_wraps.cfg
	etc/packs/databases/oracle/services/seg_top10_buffer_busy_waits.cfg
	etc/packs/databases/oracle/services/seg_top10_logical_reads.cfg
	etc/packs/databases/oracle/services/seg_top10_physical_reads.cfg
	etc/packs/databases/oracle/services/seg_top10_row_lock_waits.cfg
	etc/packs/databases/oracle/services/session_usage.cfg
	etc/packs/databases/oracle/services/sga_data_buffer_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_dictionary_cache_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_latches_hit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_gethit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_pinhit_ratio.cfg
	etc/packs/databases/oracle/services/sga_library_cache_reloads.cfg
	etc/packs/databases/oracle/services/sga_shared_pool_free.cfg
	etc/packs/databases/oracle/services/sga_shared_pool_reloads.cfg
	etc/packs/databases/oracle/services/soft_parse_ratio.cfg
	etc/packs/databases/oracle/services/stale_statistics.cfg
	etc/packs/databases/oracle/services/switch_interval.cfg
	etc/packs/databases/oracle/services/sysstat.cfg
	etc/packs/databases/oracle/services/tablespace_can_allocate_next.cfg
	etc/packs/databases/oracle/services/tablespace_fragmentation.cfg
	etc/packs/databases/oracle/services/tablespace_remaining_time.cfg
	etc/packs/databases/oracle/services/tablespace_usage.cfg
	etc/packs/databases/oracle/services/tnsping.cfg
	etc/packs/os/linux/commands.cfg
	etc/packs/os/linux/services/cpu.cfg