Merge "Tweak test app makefile with extra resources" into oc-dev