Preserve outout as much as possible in delete shared case
Preserve outout as much as possible in delete shared case

This is a further refinement of recent changes to prevent an
error from being reported when an s2i application ends which
is using a shared cluster. This change prevents an error from
being reported but keeps the output as close as possible to
previous versions.

rimolive/oshinko-s2i,rimolive/oshinko-s2i,tmckayus/oshinko-s2i,tmckayus/oshinko-s2i,tmckayus/oshinko-s2i,rimolive/oshinko-s2i