Merge rosserial_server from Mike Purvis and alignment fix from Lorenzo Riano after local merge and test

Pre-release merge