Changes from Batch Test

Issue-ID: AAF-789
Change-Id: Id07cb5dbc29c52b85de09471510a5c44c8b368b8
Signed-off-by: Instrumental <jonathan.gathman@att.com>
11 files changed