3.1.0 prep
Merge pull request #626 from mhaskel/3.1.0-prep

3.1.0 prep
Forgot to add SLES12 to metadata. yay.
Merge pull request #627 from mhaskel/metadata_fix

Forgot to add SLES12 to metadata. yay.
Merge pull request #628 from mhaskel/merge_3.1.x_into_master

Merge 3.1.x into master