Rolling termination working.  Fixes #8501.
Merge pull request #8966 from jlaska/devel

Include el7 mariadb support in mysql integration test
Use utils.merge_hash() instead of update for cache merging

Fixes #8968
Merge pull request #8901 from jsmartin/ec2_replace_all

Rolling Instance Replace.  Fixes #8501.
Add PR testing guide (95% from James).
Remove reference to deprecated input mechanism.
Correct mysql integration indentation