fix EngineVersion for PendingModifiedValues (plus minor cleanup)
Merge pull request #2982 from 20goto10/feature/fix_pending_engine_version

AWS RDS - Fix EngineVersion for PendingModifiedValues (plus minor cleanup)