Merge branch 'sensu' into 'master'

if storage.swap is defined

See merge request !15