Merge pull request #3530 from rmillner/pythocalypse_stg

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-python] release [0.8.9-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.13.11-1].
Bug 1003969: Don't raise if processed ERBs no longer exist to delete
Bug 1004008: Use symlink test rather than -e before call to rm
Merge pull request #3537 from ironcladlou/stg/bz/1003969

Merged by openshift-bot
Merge pull request #3540 from ironcladlou/stg/bz/1004008

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.8.7-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.13.13-1].