dcb_remove_callback() still had the old callback prototype
fixed some warnings about const -> non-const conversions
support --long options with getopt_long()
Fixed typo
Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
Some general tidyup plus addition of code to block zombie processing
if epoll_wait returned multiple descriptors
Addition of code to prevent multiple hangup's beign processed on the same
DCB
Bug 546 - use of weghtby causes entry in error log
Merge branch 'hartmut-compile-warnings' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-compile-warnings
Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh

Conflicts:
	server/include/dcb.h

Resolved
Merge branch 'hartmut-getopt_long' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-getopt_long
Merge branch 'hholzgra-hartmut-getopt_long' into release-1.0beta-refresh

Conflicts:
	client/maxadmin.c

Resolved
bug 506 - add command line option (-l --log=file) to log to file or
shared memory. Only affects trace and debug logs.
Merge branch 'release-1.0beta-refresh' into cmake_build