Merge branch 'prod'
BUG 937657 -- Sort the DHCP scopes
moved some stuff around
BUG 923658 -- Added a nagging blinky thing to get users to set their views
fixed syntax error
changes
Merge branch 'master' into prod