improved manifest reading for /diag
improved manifest reading for /diag

Change-Id: I58063026f373891c03e5d7fe8b2ec2c920d8aab4
Reviewed-on: http://review.northscale.com/2557
Tested-by: Aliaksey Kandratsenka <340b8e09ca65cd3fc686427fcfed17e87eaf61e2@gmail.com>
Reviewed-by: Matt Ingenthron <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@northscale.com>

daverigby/ns_server,pavel-blagodov/ns_server,t3rm1n4l/ns_server,t3rm1n4l/ns_server,vzasade/ns_server,mschoch/ns_server,mschoch/ns_server,nimishzynga/ns_server,ceejatec/ns_server,mschoch/ns_server,vzasade/ns_server,pavel-blagodov/ns_server,t3rm1n4l/ns_server,mschoch/ns_server,ceejatec/ns_server,membase/ns_server,mschoch/ns_server,vzasade/ns_server,pavel-blagodov/ns_server,membase/ns_server,daverigby/ns_server,daverigby/ns_server,t3rm1n4l/ns_server,nimishzynga/ns_server,membase/ns_server,daverigby/ns_server,mschoch/ns_server,ceejatec/ns_server,membase/ns_server,nimishzynga/ns_server,nimishzynga/ns_server,vzasade/ns_server,ceejatec/ns_server,membase/ns_server,membase/ns_server,t3rm1n4l/ns_server,daverigby/ns_server,nimishzynga/ns_server,ceejatec/ns_server,ceejatec/ns_server,pavel-blagodov/ns_server,nimishzynga/ns_server