2.4.0 Beta

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Require Avocado 2.4 branch

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Use standardized key for page-based resources

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #196 from cbmi/issue-163

Use standardized key for page-based resources
Include labels in field distribution resource data

Signed-off-by: Don Naegely <naegelyd@gmail.com>