CDK-575: Fixes to CDH5 app parent from examples testing.