Created attachment 1513143 [details] 6.3 patch
Moving to post via patch attached. Upstream issue does not contain the full changes needed.
This was delivered in Satellite 6.5, and I do not see this getting backported. Closing this out. Customers wanting this fix should upgrade to Satellite 6.5.