2014-SV3+SV4 Robot and Poodle fixes

This branch should include the following changes cherry-picked from the 5.0.6 branch:
- the additional modifications to the Robot configuration
- the Poodle fix
- the version history changes