Simplify the build since we only need one application image for both the calculator and the expert app

I have updated both the test and the prod instances to reflect this change.

@nitarocc - what command do you use to generate the oc configfiles? Can we put it as a comment at the top of each file so that it is easy to re-create?