Adressing proxy promotion issues #773
Patryk-Stefanski wants to merge
Patryk-Stefanski:THREESCALE-7135-update
into 3scale:master
Patryk-Stefanski:THREESCALE-7135-update
into 3scale:master