Merge pull request #324 from davidvossel/master

High: crmd: cl5164 - Fixes crmd crash when using pacemaker-remote
High: crmd: cl5164 - Fixes crmd crash when using pacemaker-remote
Low: lrmd: Simplify lrmd client's usage of stonith api
Merge pull request #325 from davidvossel/master

simplify lrmd client's usage of stonith api
Fix: crmd: Prevent messages for remote crmd clients from being relayed to wrong daemons

When crmd is relaying a message for a remote client like "crmadmin -S",
the "sys_to" field is the client uuid of the crmadmin. The result of
sscanf() in text2msg_type() is random in this case. So that the message
could be sent to other daemons.
High: crmd: Properly handle recurring monitor operations for remote-node agent
Merge pull request #327 from davidvossel/master

handle recurring monitor failures for remote-node resource agent
Merge pull request #326 from gao-yan/remote-client-message

Fix: crmd: Prevent messages for remote crmd clients from being relayed to wrong daemons
Fix: remove the mainloop_trigger that are no longer needed.
Merge pull request #328 from yuusuke/fix_memory_leak

Fix: remove the mainloop_trigger that are no longer needed.
Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
	lib/lrmd/lrmd_client.c