CLOUDSTACK-1029:Enter the token to specified project is malfunctioned
fix for CLOUDSTACK-1050
Merge remote-tracking branch 'upstream/master'