Gather disk metrics from EBS when using EBS storage

As requested, applied the EBS volume metrics patch to the develop branch.