Do not fail and error out before shutdown if removal of pid file fails.
New release version. Now we can build el5 rpms on el6+
Merge branch 'release_2.1'