refactor($q): make $q Promises A+ v1.1 compilant

Refactor to make $q Promises A+ v1.1 compilant
One is the function that is exposed to resolve the promise and the other to resolve a *locked* promise