Merge 94311316--play-memory-options to master

[Completes #94311316]

Author: Christopher Frost

lib/java_buildpack/util/play/post22.rb

@@ -48,7 +48,7 @@ def java_opts
             fail "Invalid Java option contains more than one option: '#{option}'"
           end
 
-          java_opts.map { |java_opt| "-J#{java_opt}" }
+          java_opts.map { |option| option == '$CALCULATED_MEMORY' ? '${CALCULATED_MEMORY//-/-J-}' : "-J#{option}" }
         end
 
         # (see JavaBuildpack::Util::Play::Base#lib_dir)

spec/java_buildpack/util/play/post22_spec.rb

@@ -59,6 +59,14 @@
       end
     end
 
+    context do
+      let(:java_opts) { super() << '$CALCULATED_MEMORY' }
+
+      it 'does wraps the output of CALCULATED_MEMORY correctly' do
+        expect(play_app.release).to include('${CALCULATED_MEMORY//-/-J-}')
+      end
+    end
+
     context do
       let(:java_opts) do
         super() << '-Dappdynamics.agent.nodeName=$(expr "$VCAP_APPLICATION" : \'.' \