Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Don't require templates and applications for triggers and graphs as they will map themselves
Merge branch 'upstream'
Fix merge conflicts
Be sure taht zabbix_agent is start and enable
add a service_state attribute
Default values can/must be in attribute file
Remove mysql-devel package because it conflicts with some versions of mysql (percona) and isn't required to build the server
use correct variable name
undo changing variable names; access host via the graph_item
add logging
remove nil check because i reversed the logic in a previous commit
escape backslashes in item keys and trigger expressions
add a missing comma; remove an old comment that isn't needed
remove gsubs because they don't work; must escape manually
Merge branch 'upstream'
Merge branch 'upstream' into cleanup_lwrps
add configuration options for java gateway