Merge branch 'dev' into 'dev_roadtomitaka'

# Conflicts:
#   Puppetfile
#   manifests/profile/zabbix/agent.pp
#   manifests/profile/zabbix/server.pp
#   manifests/role/monit_agent.pp
#   manifests/role/monit_server.pp
#   metadata.json