add :product_id and :lock_version to the variant attributes list. [Fixes
Adding :original to spree_api_key_layout override

Resolves warning:

    Deface: [WARNING][0m No :original defined for 'api_key_spree_layout', you should change its definition to include:
     :original => 'eb4b04993e8e4d1c20a7c3d974dfed20b59aec4c'

Fixes #3710
Remove blank username line in dummy database.yml mysql config

For some reason activerecord-jdbcmysql-adapter hates blank usernames
and will not connect despite the fact that mysql2 works fine. Removing
these lines doesn't break mysql2 so I see no reason to keep them there.
I'm trying to test my gems on jruby in anticipation of spree working on
jruby so this fix would be helpful. Here's sample Travis output showing
what goes wrong:
https://travis-ci.org/swrobel/spree_zero_stock_products/jobs/11136157

Fixes #3693