Set master type correctly when launching spot.
Bumping Ambari to 1.6.1 (for Redhat/CentOS/Oracle only). Not tested.