Merge "Update logbax.xml and create test resources."