New upstream version 0.12.0
Merge branch 'upstream' into debian
Import patch to fix version.py

As dh_auto_clean runs setup.py we have to patch the salt code first, otherwise
it may create a problem. This can be removed after 0.12.0
Update changelog for 0.12.0-1 release