Merge branch 'release-1.0beta-refresh' into blr

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

server/modules/include/maxscaled.h

@@ -30,13 +30,15 @@
  * @endverbatim
  */
 #include <dcb.h>
+#include <spinlock.h>
 
 /**
  * The telnetd specific protocol structure to put in the DCB.
  */
 typedef struct	maxscaled {
-	int	state;		/**< The connection state */
-	char	*username;	/**< The login name of the user */
+	SPINLOCK	lock;		/**< Protocol structure lock */
+	int		state;		/**< The connection state */
+	char		*username;	/**< The login name of the user */
 } MAXSCALED;
 
 #define	MAXSCALED_STATE_LOGIN	1	/**< Issued login prompt */