Don't append .b1 to version

Adding %{release_letter}%{milestone} to full_release confuses
firestack, because it creates upstream tarballs based on only
%{version}.  Consequently %setup fails as it can't cd to the right
directory.
m2crypto patch fix

Bring patch up-to-date with latest requirements.txt
Remove bug1186389 patch

Merged upstream

Conflicts:
	openstack-heat.spec
heat-cfn, heat-boto, heat-watch removed

The above tools were removed in upstream
34e47b64d926c055d9895c5b3f27949eaca68999 into a separate
developer-only repo.