Merge pull request #59 from ziggimon/master

Fix for Fedora 18, so we don't have PMS starting twice.
[ros6] Make it ready for delivery
Merge remote branch 'upstream/master' into xwavertest