Fix CanaryLib/#1 ticket.
Merge pull request #2 from greatman/master

Addition to CanaryLib/#4
Merge remote-tracking branch 'public/master' into 172dev
fixing imports and ServerConfigurationManage added and fixed (i hope)